summarylogtreecommitdiffstats
path: root/.SRCINFO
diff options
context:
space:
mode:
Diffstat (limited to '.SRCINFO')
-rw-r--r--.SRCINFO14
1 files changed, 0 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cd4637be52fc..014674b1393b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,6 @@
pkgbase = extraterm-bin
pkgdesc = The swiss army chainsaw of terminal emulators.
-<<<<<<< HEAD
pkgver = 0.77.0
-||||||| de506193
- pkgver = 0.75.0
-=======
- pkgver = 0.76.0
->>>>>>> ba97db33307c982db1ab4d527e34ebd040e63a0f
pkgrel = 1
url = https://github.com/sedwards2009/extraterm
arch = x86_64
@@ -21,15 +15,7 @@ pkgbase = extraterm-bin
depends = pango
depends = krb5
conflicts = extraterm
-<<<<<<< HEAD
source = https://github.com/sedwards2009/extraterm/releases/download/v0.77.0/extratermqt_0.77.0_amd64.deb
sha256sums = 804c4c2e40056d8f03cb4b5ad22518d84703bf89a7d655789c565c99dba01137
-||||||| de506193
- source = https://github.com/sedwards2009/extraterm/releases/download/v0.75.0/extratermqt_0.75.0_amd64.deb
- sha256sums = 3f9e50c7321c57a9efa52890613c252ba617f9203e9163eabcfa21d3da887387
-=======
- source = https://github.com/sedwards2009/extraterm/releases/download/v0.76.0/extratermqt_0.76.0_amd64.deb
- sha256sums = 898f40b09e08c274141645af1ec7f0d3e949601548cc4c40f724720acb1cf304
->>>>>>> ba97db33307c982db1ab4d527e34ebd040e63a0f
pkgname = extraterm-bin