Merge remote-tracking branch 'origin/master'

PhyXTGears-programming · Mar 25, 2017 · 99c8ffb · 99c8ffb
2 parents 05a8f3e + e9e7062
commit 99c8ffb
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Starship.ino b/Starship.ino
@@ -1,4 +1,5 @@
 void explodingCircle (int x, int y, int r, uint16_t color) {
+<<<<<<< HEAD
   //  matrix.fillCircle(x, y, r);
 }
 
@@ -15,5 +16,12 @@ void drawShip (int x, int y, float s, uint16_t color) {
 //  matrix.fillCircle();
 
   updateScreen();
+=======
+  matrix.fillCircle(x, y, r);
+}
+
+void drawShip (int x, int y, float s) {
+  matrix.drawLine();
+>>>>>>> master
 }