Fix github's terrible solution to merge conflict

ffs, github...
SpenceKonde · Sep 22, 2015 · 54a23e2 · 54a23e2
1 parent 7f46eac
commit 54a23e2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/platform.txt b/platform.txt
@@ -6,11 +6,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=ATtiny Classic
-<<<<<<< HEAD
 version=1.0.4
-=======
-version=1.0.3
->>>>>>> origin/boardmanager
 
 # AVR compile variables
 # ---------------------