Move markupsafe to conflict for precise build

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

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/requires/precise_conflict.txt b/requires/precise_conflict.txt
@@ -16,3 +16,5 @@ repoze.who==1.0.19
 repoze.who.plugins.openid==0.5.3
 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
diff --git a/requires/precise_missing.txt b/requires/precise_missing.txt
@@ -14,5 +14,3 @@ pairtree==0.7.1-T
 ofs==0.4.1
 
 apachemiddleware==0.1.1
-# markupsafe is required by webhelpers==1.2 required by formalchemy with SQLAlchemy 0.6
-markupsafe==0.15