summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD3
1 files changed, 0 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 0faea1f5e8a4..a892589dadb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,4 @@
pkgname=identity
-<<<<<<< HEAD
-pkgver=0.5.0
-=======
pkgver=0.6.0
>>>>>>> 4b062e9 (update to 0.6.0)
pkgrel=1