summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingbei Li2024-03-29 20:43:57 +0800
committerJingbei Li2024-03-29 20:43:57 +0800
commitffec341f2874a5ee395432f199bfca00362e9df4 (patch)
tree038c643289f946ef8b2c29c57cb5ec039785a29c
parent3a9d6dad0d600dc888562cb500d513b53faf4dcc (diff)
downloadaur-ffec341f2874a5ee395432f199bfca00362e9df4.tar.gz
fixed conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a167c6e54970..e94159d5a67a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,7 @@ pkgbase = python-ruamel-yaml-hg
makedepends = wget
depends = python
provides = python-ruamel-yaml
- conflicts = python-ruamel-yaml-hg
+ conflicts = python-ruamel-yaml
source = yaml::hg+http://hg.code.sf.net/p/ruamel-yaml/code
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 00469a486919..20e949b6ddf9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ groups=('devel')
depends=('python')
makedepends=('mercurial' 'python-setuptools' 'wget')
provides=('python-ruamel-yaml')
-conflicts=('python-ruamel-yaml-hg')
+conflicts=('python-ruamel-yaml')
source=("${_hgname}::hg+http://hg.code.sf.net/p/ruamel-yaml/code")
md5sums=('SKIP')