manifest: aosp: Fix mismerge

Change-Id: I4b0df41082f74ba2153046b58b7d1e5565d1381a
Signed-off-by: Humberto Borba <humberos@omnirom.org>

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>