From 7d7d0855d402e1876b7e58dff1faefe0b7f24cc4 Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Sat, 27 Mar 2021 17:03:43 -0400
Subject: [PATCH] gui: fix bad merge

Change-Id: I67dc921a35e6dbc419bd9cfebcca66296b65d8e6
---
 gui/Android.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gui/Android.mk b/gui/Android.mk
index bf64a77d..43a3d83f 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 @@ endif
 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)