From 3093b238a96adaed0487b5d36676affb262dd1e3 Mon Sep 17 00:00:00 2001
From: dnelband <dnelband@gmail.com>
Date: Tue, 27 Aug 2019 18:11:35 +0200
Subject: [PATCH] merged conflict

---
 pkg/appimage/appimagebuild | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkg/appimage/appimagebuild b/pkg/appimage/appimagebuild
index 2be7e31..0fdeabb 100755
--- a/pkg/appimage/appimagebuild
+++ b/pkg/appimage/appimagebuild
@@ -1,12 +1,7 @@
 #!/bin/bash
 
-<<<<<<< HEAD
 PKGNAME='pling-store'
 PKGVER='4.1.1'
-=======
-PKGNAME='ocs-store'
-PKGVER='5.0.0'
->>>>>>> parent of 5df96a3... revert to pling-store
 PKGREL='1'
 
 UPDINFO='zsync|http://dl.opendesktop.org/api/files/download/id/1532435039/as/latest/ocs-store-x86_64.AppImage.zsync'
-- 
GitLab