From 17e825874dc53d5ae389560c3b79dad7bec1b9ce Mon Sep 17 00:00:00 2001
From: maxwen <max.weninger@gmail.com>
Date: Tue, 18 Sep 2018 21:26:44 +0200
Subject: [PATCH] manifest: fix merge error

Change-Id: I6ece658cfc03a2343db1b2e614df608024488e39
---
 default.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/default.xml b/default.xml
index dd82830..b274bb4 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>