summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
1 files changed, 1 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5615ae8ecba9..29cfb14d5c1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,7 @@
pkgbase = websockify
pkgdesc = WebSockets support for any application/server
-<<<<<<< HEAD
- pkgver = 0.10.0
- pkgrel = 2
-||||||| 764f5eb
- pkgver = 0.10.0
- pkgrel = 1
-=======
pkgver = 0.11.0
- pkgrel = 1
->>>>>>> origin/master
+ pkgrel = 2
url = https://github.com/novnc/websockify
arch = any
license = LGPL3