summarylogtreecommitdiffstats
path: root/.SRCINFO
diff options
context:
space:
mode:
authorDaniel Bermond2019-06-29 19:13:39 +0000
committerDaniel Bermond2019-06-29 19:13:39 +0000
commit224a84937962ce8573885ee01850f88025a5d04c (patch)
treefd6ef80dedf85b359d43ff8d0a864945a9f7fa07 /.SRCINFO
parent34eb4f678f5d8a54f906ddd7a0b5a9c4192aaadc (diff)
downloadaur-224a84937962ce8573885ee01850f88025a5d04c.tar.gz
Fix conflicts
Diffstat (limited to '.SRCINFO')
-rw-r--r--.SRCINFO4
1 files changed, 3 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 01bdcfdc34b1..30602eab9a6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = caffe2-git
pkgdesc = A new lightweight, modular, and scalable deep learning framework
pkgver = 0.8.2.r18962.gd8de69d621
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://caffe2.ai/
arch = x86_64
@@ -104,6 +104,7 @@ pkgname = caffe2-git
pkgdesc = A new lightweight, modular, and scalable deep learning framework (cpu only, git version)
provides = caffe2
provides = caffe2-cpu-git
+ conflicts = python-pytorch
conflicts = caffe2
conflicts = caffe2-cpu-git
replaces = caffe2-cpu-git
@@ -125,5 +126,6 @@ pkgname = caffe2-cuda-git
provides = caffe2
provides = caffe2-git
provides = caffe2-cuda
+ conflicts = python-pytorch
conflicts = caffe2