lenovo-karatep: Modified APKBUILD so MR can pass tests

device/testing/device-lenovo-karatep/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
-<<<<<<< Updated upstream
 # Maintainer: SeMi2309 <semi2309@gmail.com>
-=======
->>>>>>> Stashed changes
 pkgname=device-lenovo-karatep
 pkgdesc="Lenovo K6 Note"
 pkgver=0.1
@@ -32,9 +29,6 @@ package() {
 }
 
 sha512sums="
-<<<<<<< Updated upstream
 1b8c65c135a778ea332491599b6886fc5c54ec26ebe14925ccf8385d56f09af1999d1e7c0dec17169cb7f5e1c30c1a6f5a5a9815861b95f6d480a01985cdbdfb  deviceinfo
-=======
 b32dfe2d7fc90f47007b55bbca26f4cfb55f6d578c11cef0a04e5f8cf73643e8966b1d1ace85554bc51fd1082aa4b94ad3088ba1caef9d022480a143c86ac49a  deviceinfo
->>>>>>> Stashed changes
 "

device/testing/linux-lenovo-karatep/APKBUILD

 # Reference: <https://postmarketos.org/vendorkernel>
-<<<<<<< Updated upstream
 # Kernel config based on: arch/arm64/configs/karatep_defconfig
-=======
-# Kernel config based on: arch/arm64/configs/(CHANGEME!)
->>>>>>> Stashed changes
 
 pkgname=linux-lenovo-karatep
 pkgver=3.18.124
@@ -42,11 +38,8 @@ source="
 	$_config
 	gcc10-extern_YYLOC_global_declaration.patch
 	proc.S_patch.patch
-<<<<<<< Updated upstream
-=======
 	0001-Comment-lines-that-are-sending-Touchscreen-info-to-k.patch
 	0001-Framebuffer-patch-for-MSM8937.patch
->>>>>>> Stashed changes
 "
 builddir="$srcdir/$_repository-$_commit"
 _outdir="out"
@@ -69,15 +62,9 @@ package() {
 
 sha512sums="
 c4be8501316f62db3b93ec0398bf59fe46f287447d7f5a163940efcdde3f3dd5d4a21e093801a49ad57100d002564bd94af12c545360cd72c6e2a93efb40816b  linux-lenovo-karatep-f23254d4fbeb0e6d8ac866568f69a81b776a6437.tar.gz
-<<<<<<< Updated upstream
 8343e4981bedaa8a9bd2b7260768af2cf881a05c4fd0af28aeb763e55de669d46e2f50402e8521a34e346f6b048091a0ebcaec451cff8d4014162a7b276e60f2  config-lenovo-karatep.aarch64
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
 79a5352a6e2120e6775a879c13cfe91f204c2e5ff13aed66d23ef8b3a64b16dcacfe6efeb48500156c8c5ae48f95d33e848658a253d6133717a90d904bca9c1c  proc.S_patch.patch
-=======
-cac45e79e93723d30386b159a7768971d9f8a3c287bca234a96ebb1721a59d8ed084e58173da5dc617dde16a7050127bdb23e98f5bcbc15061616d07eb575665  config-lenovo-karatep.aarch64
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
-79a5352a6e2120e6775a879c13cfe91f204c2e5ff13aed66d23ef8b3a64b16dcacfe6efeb48500156c8c5ae48f95d33e848658a253d6133717a90d904bca9c1c  proc.S_patch.patch
 acb22fbbac4fcff04c9df4c1abc4c6a1f50022a7ec2fe3108621bcca7d862a5b49ca63a5bba1e392101fc7569c3ac98e855cf472e116c8f66c7d999d6cae0cca  0001-Comment-lines-that-are-sending-Touchscreen-info-to-k.patch
 9f73fb305241e04d45717f894d9e1b59aba4ef80bd8af9790dd00c0ba2f59429a8f076386a906f98c8251c473738287c835b9e00fb88e330d942a5af2609a2a9  0001-Framebuffer-patch-for-MSM8937.patch
->>>>>>> Stashed changes
 "