From 7e2d45974416756ba732353bee72c8090ee2eaa2 Mon Sep 17 00:00:00 2001
From: Matthew Zamora <matt@mocomakers.com>
Date: Fri, 4 Oct 2024 13:19:24 -0400
Subject: [PATCH] Fix merge issue

---
 src/fipsy.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/fipsy.cpp b/src/fipsy.cpp
index 1f534eb..bb7452b 100644
--- 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