asgardius/platform_manifest_twrp_omni
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

manifest: aosp: Fix mismerge

Browse source 
Change-Id: I4b0df41082f74ba2153046b58b7d1e5565d1381a
Signed-off-by: Humberto Borba <humberos@omnirom.org>
This commit is contained in:
Humberto Borba 2018-08-07 18:23:59 -03:00
parent 98cf16f532
commit cd50e5dfeb
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
default.xml
View file

@ -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>