summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD1
2 files changed, 0 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8c8a4936c5e8..da3463261fab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,7 +12,5 @@ pkgbase = natron
depends = openfx-misc
depends = natron-compositor
optdepends = natron-plugins-git: Plugins made by the Natron community
- conflicts = natron-git
pkgname = natron
-
diff --git a/PKGBUILD b/PKGBUILD
index d1bedb370944..acdf716b8ac5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,6 +8,5 @@ pkgdesc="Open source compositing software (metapackage with the program and stan
arch=('x86_64')
url="https://natrongithub.github.io/"
license=('GPL')
-conflicts=("${pkgname}-git")
depends=('openfx-arena' 'openfx-gmic' 'openfx-io' 'openfx-misc' 'natron-compositor')
optdepends=('natron-plugins-git: Plugins made by the Natron community')