From cd50e5dfebaeb546fd842dc0512a72e988aedae9 Mon Sep 17 00:00:00 2001
From: Humberto Borba <humberos@omnirom.org>
Date: Tue, 7 Aug 2018 18:23:59 -0300
Subject: [PATCH] manifest: aosp: Fix mismerge

Change-Id: I4b0df41082f74ba2153046b58b7d1e5565d1381a
Signed-off-by: Humberto Borba <humberos@omnirom.org>
---
 default.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/default.xml b/default.xml
index 835c87b..d3d5a22 100644
--- a/default.xml
+++ b/default.xml
@@ -618,14 +618,9 @@
   <project path="tools/test/connectivity" name="platform/tools/test/connectivity" groups="pdk" />
   <project path="tools/tradefederation/core" name="platform/tools/tradefederation" groups="pdk,tradefed" />
   <project path="tools/tradefederation/contrib" name="platform/tools/tradefederation/contrib" groups="pdk,tradefed" />
-<<<<<<< HEAD
   <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
 
   <!-- OmniROM -->
   <include name="omni-default.xml" />
-=======
-
-  <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
->>>>>>> android-8.1.0_r42
 
 </manifest>