fix merge conflicts

trunk/PKGBUILD

@@ -47,7 +47,7 @@ prepare() {
 	  mkspecs/common/gcc-base.conf
 	sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
 	  mkspecs/common/g++-unix.conf
-	
+
 	patch -p1 -i ../qtbug-77364.patch # Fix keyboard input in webengine
 }
 
@@ -94,15 +94,15 @@ package_qt5-base() {
 
 	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
 	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
 
 	## Fix wrong qmake path in pri file
 	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	"${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
+	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
 
 	## Symlinks for backwards compatibility
 	for b in "${pkgdir}"/usr/bin/*; do
-	ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
 	done
 }
 
@@ -165,7 +165,6 @@ optdepends=(
 
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 
-sha512sums=('33b74cd6e8a7671b6f621ffee1e0d572ad52463eab1f041e11f769fe01706ce187601bfe93211cd00b0138a3ff9698d5138476de7c141d52f4ec330672709580'
-            '1174da76c8f2df71f8778b3ec6a5d5171b203f519652650ca099446207a53fd052b450c1ae944e70a963695f90e32a22ecb957a1738054c05eb731521247f28c'
-            '1785bfde1685cb4e8fc0128ac6e338761ec00d0f70a68b97ba176b01ab539178ac3746eb67eed3c2039c30f076475e2e87bc31fe2a9b7fce499e6324646cad31'
-            'af0c1101bf001a8ba566859eeed083dcde6dc8b32edb8eb0de6672045622167a462f2f16cb0f208fd46bfc1847c68d44fb0ec45a0b729436b40aafa08334c56c')
+sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab'
+            'dc742814ab0c1b63da5916d96e3ef01fa96007c385ed033ae5b3a8cd8608c119')
+