Merge remote-tracking branch 'origin/boardmanager' into boardmanager

Conflicts: platform.txt
SpenceKonde · Sep 22, 2015 · 7f46eac · 7f46eac
2 parents 7c1ef84 + 7f88d3c
commit 7f46eac
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/platform.txt b/platform.txt
@@ -6,7 +6,11 @@
 # 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
 # ---------------------