summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorransome12021-05-05 10:04:22 +0200
committerransome12021-05-05 10:04:22 +0200
commitd276c1ef0b9040d44b0b38c0376192752af20972 (patch)
tree72700ce5443263f6baa2b4659ed2cc645ed18a8d
parent2e915e1bad407d8cf3a2250c9d71bdab9ffddfe5 (diff)
parentda1be3e6fa482146559e4456797868e0e0087c04 (diff)
downloadaur-d276c1ef0b9040d44b0b38c0376192752af20972.tar.gz
Merge branch 'master' of ssh://aur.archlinux.org/sleek
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 7 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5afe8df7d8d..6a326f75872 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = sleek
pkgdesc = Todo app based on the todo.txt format for Linux, free and open-source
- pkgver = 1.0.3
+ pkgver = 1.0.2
pkgrel = 1
url = https://github.com/ransome1/sleek/
arch = x86_64
@@ -9,7 +9,7 @@ pkgbase = sleek
depends = electron
depends = nodejs
options = !strip
- source = https://github.com/ransome1/sleek/archive/refs/tags/v1.0.3.zip
+ source = https://github.com/ransome1/sleek/archive/refs/tags/v1.0.2.zip
source = sleek.desktop
source = sleek.sh
sha512sums = 24457a25cbe71ec45927945f45fe9866ca83f23d885abc88593a7f50fb2c232b62bb2a13138568a4ce14145113408063d24e413d0f5ff4bf44c96f7b2439b1bf
diff --git a/PKGBUILD b/PKGBUILD
index 67a7566b138..0774c984a7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: ransome <ransome@uber.space>
pkgname="sleek"
-pkgver=1.0.3
+pkgver=1.0.2
pkgrel=1
pkgdesc="Todo app based on the todo.txt format for Linux, free and open-source"
arch=("x86_64")
@@ -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')