"...git@git.sphere.ly:varun.chitre15/thunderzap_sprout.git" did not exist on "58b053e4ce9d2fc3023645c1b96e537c72aa8d9a"
Commit a9cab225 authored by KBizzle's avatar KBizzle
Browse files

Correct issue with merge

parent c97da8c9
......@@ -46,7 +46,6 @@ endif
ifeq (pac_i927,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_i927.mk
endif
<<<<<<< HEAD
ifeq (pac_d710,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES += $(LOCAL_DIR)/pac_d710.mk
endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment