summarylogtreecommitdiffstats
path: root/.SRCINFO
diff options
context:
space:
mode:
authorhaawda2017-12-24 17:12:22 +0100
committerhaawda2017-12-24 17:12:22 +0100
commitafcc64dc5d9cd8f80faa5fdad206ed5927bafeb8 (patch)
tree9f1e4644c3c5654d3523b885c7cc0efe7cbff17b /.SRCINFO
parent794278deb68781b04c6dfd6f935d08ba80c62638 (diff)
downloadaur-afcc64dc5d9cd8f80faa5fdad206ed5927bafeb8.tar.gz
fix conflict
Diffstat (limited to '.SRCINFO')
-rw-r--r--.SRCINFO8
1 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 31a48c075f19..80af15ca8294 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = python-sqlalchemy-git
pkgdesc = Python SQL toolkit and Object Relational Mapper
pkgver = 1.2.0rc11294.1abc8e550
- pkgrel = 1
+ pkgrel = 2
url = http://www.sqlalchemy.org
arch = i686
arch = x86_64
@@ -9,12 +9,14 @@ pkgbase = python-sqlalchemy-git
makedepends = git
makedepends = python-setuptools
depends = python
- provides = python-sqlalchemy=1.2.0rc11294.1abc8e550
- conflicts = python-sqlalchemy
source = git+https://bitbucket.org/zzzeek/sqlalchemy.git
md5sums = SKIP
pkgname = python-sqlalchemy-git
+ provides = python-sqlalchemy=1.2.0rc11294.1abc8e550
+ conflicts = python-sqlalchemy
pkgname = python2-sqlalchemy-git
+ provides = python2-sqlalchemy=1.2.0rc11294.1abc8e550
+ conflicts = python2-sqlalchemy