updated patch info and checksums

device/testing/linux-sony-hollyss/APKBUILD

@@ -47,5 +47,10 @@ sha512sums="db24fa217ec5877c688e376b3bc9b8c76c59dc3bd89bdbba5a1c133c2645d0cb945c
 b2176f7259c4234732ea82592c2587004478e3e7743eddd3ef275dcfd4f19f60fea8255ee943653faeb525e727def80e381918bc620a813bbd7b6dd65bbb5bd6  config-sony-hollyss.aarch64
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
+<<<<<<< HEAD
 e0ededeef62e49a36bfc27b18cb65b1d417e771e8500463dd394f5c7558571aacabac251873a8476ee1f91d7c8bf84ee6b6444f4f198e2fe7ddb310138f15e7c  mt_cpufreq_64.c.patch
 d290271d2133e071f2d8a2ac8c54a2e0be0b556b2faf87954ff69f15db31a9dc16a312c45d1955f7dfd227443f418242f41c3a6c88ccac43d4d43cfbcd210143  setup.c.patch"
+=======
+f14120224c75ed3ca2944ec92a684d16643f4517cd86f328fb85dffca501ea7eef40daec1b24ed8b9877c4f888fa00e5d91a0fa57e74ed5eae156aeb38ddf09e  mt_cpufreq_64.c.patch
+d120bafcc31d6bc25009057a213ca4731e5074c9a21271fb492bbe82ec95d9d769a757aa931677970ff45cb525850ea27a7864ba1ec8f982931d9aafb8635077  setup.c.patch"
+>>>>>>> fe6cdc91c25627be1ad4853c29016f6142f0953d