From 4003113a25f9685abedc738531110484e85d5b95 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 16 May 2018 19:30:00 -0400
Subject: [PATCH] Fixes

---
 Manifests/Manifest_LAOS-15.1.xml    | 2 +-
 Scripts/LineageOS-15.1/Functions.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml
index 46255123..dce13144 100644
--- a/Manifests/Manifest_LAOS-15.1.xml
+++ b/Manifests/Manifest_LAOS-15.1.xml
@@ -196,7 +196,7 @@
 	<!-- Samsung Galaxy S5 (klte) -->
 	<project path="device/samsung/klte" name="LineageOS/android_device_samsung_klte" remote="github" />
 	<project path="device/samsung/klte-common" name="LineageOS/android_device_samsung_klte-common" remote="github" />
-	<project path="device/samsung/msm8974-common" name="LineageOS/android_device_samsung_msm8974-common" remote="github" />s
+	<project path="device/samsung/msm8974-common" name="LineageOS/android_device_samsung_msm8974-common" remote="github" />
 	<project path="kernel/samsung/msm8974" name="LineageOS/android_kernel_samsung_msm8974" remote="github" />
 
 	<!-- NXP
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 2a92de46..3181ee4d 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -75,10 +75,10 @@ patchWorkspace() {
 	source build/envsetup.sh;
 	repopick -f 206123; #bionic: Sort and cache hosts file data for fast lookup
 	repopick -f 209030; #ContactsProvider: Prevent device contact being deleted.
-	repopick 215174; #CallLogDatabase: Bump the version and try to re-run the version 5 upgrade path
-	repopick 214824 215010; #g3-common
-	repopick 211404 211405 211406 211407 211408 211409; #d852
-	repopick 211396 214817; #d855
+	repopick -f 215174; #CallLogDatabase: Bump the version and try to re-run the version 5 upgrade path
+	repopick -f 214824 215010; #g3-common
+	repopick -f 211404 211405 211406 211407 211408 211409; #d852
+	repopick -f 211396 214817; #d855
 	#repopick -t trust_interface;
 
 	source $scripts/Patch.sh;