1 files changed, 4 insertions, 0 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 9ac59d0d27a2..0774c984a7df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,11 @@ options=(!strip)
 makedepends=("yarn")
 depends=("electron" "nodejs")
 source=("${url}archive/refs/tags/v${pkgver}.zip" "sleek.desktop" "sleek.sh")
+<<<<<<< HEAD
+sha512sums=('66039ad58f04267af5a6305d3ef68fd580e4d7327dbaf68bdb0c6235acd1235f206698cddfdeef2f1c7b14c8a4bf93457c49d7acbed05e6d14f8bddccaa99924'
+=======
 sha512sums=('24457a25cbe71ec45927945f45fe9866ca83f23d885abc88593a7f50fb2c232b62bb2a13138568a4ce14145113408063d24e413d0f5ff4bf44c96f7b2439b1bf'
+>>>>>>> da1be3e6fa482146559e4456797868e0e0087c04
             '60777dbda8202e5a265a274d126d30269fb8fba67641d22a83be19b353b4805cbed2a3c80bbc0e6ed7c0fe7ae21c3cde59b784d42d3ba941bb0fdf022c1375e8'
             'ea1d322bd56c7944a9eae97f4968a6a2e937b510eb3c1c21266428450c5b2ddcd8576718d0b66b69fbce5694ba94e80a692d04bda1e8c2b24a8d814a5ed50963')