Fix merge issue

MoCoMakers · Oct 4, 2024 · 7e2d459 · 7e2d459
1 parent 7d2181a
commit 7e2d459
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/fipsy.cpp b/src/fipsy.cpp
@@ -71,8 +71,6 @@ Fipsy::readFeatures() {
   return result;
 }
 
-<<<<<<< HEAD
-=======
 void
 Fipsy::erase(uint8_t y) {
   spiTrans<4>({0x0E, y, 0x00, 0x00});
@@ -175,4 +173,3 @@ Fipsy::programFeatures(const Features& features) {
 }
 
 } // namespace fipsy
->>>>>>> sunny/develop