Skip to content
Snippets Groups Projects
Commit 3093b238 authored by DFN2's avatar DFN2
Browse files

merged conflict

parent 14ee28e3
No related branches found
No related tags found
No related merge requests found
#!/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'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment