repair merge

Change-Id: I5729688de26e2951bcdcef6c3d8b21c9d20f4fdb

snippets/lineage.xml

@@ -39,12 +39,8 @@
   <project path="packages/apps/SimpleDeviceConfig" name="LineageOS/android_packages_apps_SimpleDeviceConfig" />
   <project path="packages/apps/Snap" name="LineageOS/android_packages_apps_Snap" />
   <project path="packages/apps/Trebuchet" name="LineageOS/android_packages_apps_Trebuchet" />
-<<<<<<< HEAD
   <!--<project path="packages/apps/UnifiedEmail" name="LineageOS/android_packages_apps_UnifiedEmail" />-->
   <!-- <project path="packages/apps/Updater" name="LineageOS/android_packages_apps_Updater" /> -->
-=======
-  <project path="packages/apps/Updater" name="LineageOS/android_packages_apps_Updater" />
->>>>>>> 50ba8eb800ca2bb79ff03886c383a23eeee6ca51
   <project path="packages/overlays/Lineage" name="LineageOS/android_packages_overlays_Lineage" />
   <project path="packages/resources/devicesettings" name="LineageOS/android_packages_resources_devicesettings" />
   <project path="prebuilts/extract-tools" name="LineageOS/android_prebuilts_extract-tools" clone-depth="1" />