commit 7d7d0855d402e1876b7e58dff1faefe0b7f24cc4
author bigbiff <bigbiff@teamw.in> Sat Mar 27 17:03:43 2021 -0400
committer bigbiff <bigbiff@teamw.in> Sat Mar 27 17:03:43 2021 -0400
tree c773e4fc71ad6325bcb9b4a8f8628eaf65db3c86
parent 9754a0771c7ce0a206476973006624c3a742259f

gui: fix bad merge

Change-Id: I67dc921a35e6dbc419bd9cfebcca66296b65d8e6

gui/Android.mk

diff --git a/gui/Android.mk b/gui/Android.mk
index bf64a77..43a3d83 100755
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -1,6 +1,4 @@
 LOCAL_PATH := $(call my-dir)
-<<<<<<< HEAD
-=======
 include $(CLEAR_VARS)
 
 LOCAL_CFLAGS := -fno-strict-aliasing -Wno-implicit-fallthrough
@@ -140,7 +138,6 @@
 LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
 
 include $(BUILD_STATIC_LIBRARY)
->>>>>>> 8fde396e... bootable: Change how blank screen works
 
 # Transfer in the resources for the device
 include $(CLEAR_VARS)