Browse Source

Remove merge marks

rfm69
Xose Pérez 6 years ago
parent
commit
eabc45061a
1 changed files with 0 additions and 1 deletions
  1. +0
    -1
      code/platformio.ini

+ 0
- 1
code/platformio.ini View File

@ -2426,7 +2426,6 @@ upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
modules = ${common.modules} sensor modules = ${common.modules} sensor
<<<<<<< HEAD
[env:blitzwolf-bwshp2] [env:blitzwolf-bwshp2]
platform = ${common.platform} platform = ${common.platform}
framework = arduino framework = arduino


Loading…
Cancel
Save