Move pyutilib into conflict.

ckan · Oct 19, 2012 · 29c49bb · 29c49bb
1 parent b797509
commit 29c49bb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/requires/lucid_conflict.txt b/requires/lucid_conflict.txt
@@ -17,3 +17,4 @@ paste==1.7.5.1
 repoze.who.plugins.openid==0.5.3
 repoze.who==1.0.19
 repoze.who-friendlyform==1.0.8
+pyutilib.component.core==4.5.3
diff --git a/requires/lucid_missing.txt b/requires/lucid_missing.txt
@@ -6,8 +6,6 @@
 -e git+https://github.com/okfn/vdm.git@vdm-0.11#egg=vdm
 
 # Packages already on pypi.python.org
-pyutilib.component.core==4.5.3
-
 solrpy==0.9.5
 formalchemy==1.4.2
 pairtree==0.7.1-T

diff --git a/requires/precise_conflict.txt b/requires/precise_conflict.txt
@@ -18,3 +18,4 @@ repoze.who-friendlyform==1.0.8
 babel==0.9.6
 # markupsafe is required by webhelpers==1.2 required by formalchemy with SQLAlchemy 0.6
 markupsafe==0.15
+pyutilib.component.core==4.5.3
diff --git a/requires/precise_missing.txt b/requires/precise_missing.txt
@@ -6,8 +6,6 @@
 -e git+https://github.com/okfn/vdm.git@vdm-0.11#egg=vdm
 
 # Packages already on pypi.python.org
-pyutilib.component.core==4.5.3
-
 solrpy==0.9.5
 formalchemy==1.4.2
 pairtree==0.7.1-T