From 85e002d319fdc643060228bddee16b35454ec5a0 Mon Sep 17 00:00:00 2001
From: daskygit <32983009+daskygit@users.noreply.github.com>
Date: Thu, 30 Dec 2021 22:18:01 +0000
Subject: [PATCH] fix conflict mistake

---
 builddefs/common_features.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index c8535d8300..fd54374587 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -207,8 +207,6 @@ else
         COMMON_VPATH += $(DRIVER_PATH)/eeprom
         SRC += eeprom_driver.c eeprom_transient.c
       endif
-	else ifeq ($(PLATFORM),PICO_SDK)
-      SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
     else ifeq ($(PLATFORM),ARM_ATSAM)
       # arm_atsam EEPROM
       OPT_DEFS += -DEEPROM_SAMD