diff --git a/packaging/flatpak/modules/pcsc.json.orig b/packaging/flatpak/modules/pcsc.json.orig deleted file mode 100644 index 7136843ef..000000000 --- a/packaging/flatpak/modules/pcsc.json.orig +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "pcsc", - "config-opts": [ - "--disable-libsystemd", - "--enable-pic", - "--disable-libusb", - "--enable-shared", -<<<<<<< HEAD -======= - "--disable-polkit", ->>>>>>> beta - "--with-systemdsystemunitdir=/app/lib/systemd/" - ], - "sources": [ - { -<<<<<<< HEAD - "type": "git", - "url": "https://github.com/LudovicRousseau/PCSC.git", - "tag": "2.0.0", - "commit": "549922c1355fdd1e85eb0a952fefda7bb96e286a" -======= - "type": "git", - "url": "https://github.com/LudovicRousseau/PCSC.git", - "tag": "2.3.0", - "commit": "a2c25c5fa25b5e2400fe6a002ea2263069ebd94f", - "x-checker-data": { - "type": "anitya", - "project-id": 2611, - "stable-only": true, - "url-template": "https://github.com/LudovicRousseau/PCSC/tags/${version0}.${version1}.${version2}" - } ->>>>>>> beta - } - ], - "cleanup": [ - "/share/doc", - "/share/man" - ] -}