entrouvert
/
pfwbged.buildout
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Conflict resolution

This commit is contained in:
Cédric Messiant 2013-01-03 11:21:36 +01:00
parent f88586b8b7 e748f8a184
commit 9c164b349a
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildout.cfg
View File

@ -4,7 +4,7 @@ port-base = 80
[buildout]
extends =
http://dist.plone.org/release/4.2.2/versions.cfg
http://dist.plone.org/release/4.2.3/versions.cfg
sources.cfg
checkouts.cfg
versions.cfg
@ -26,7 +26,7 @@ allow-hosts =
code.google.com
find-links =
http://dist.plone.org/release/4.2.2/
http://dist.plone.org/release/4.2.3/
http://pypi.ecreall.com/pypi/simple
eggs +=

2
sources.cfg
View File

@ -28,4 +28,4 @@ ecreall.helpers.testing = git ${remotes:tdesvenain}/ecreall.helpers.testing.git
ecreall.helpers.upgrade = git ${remotes:tdesvenain}/ecreall.helpers.upgrade.git pushurl=${remotes:tdesvenain_push}/ecreall.helpers.upgrade.git
pfwbged.contacts = git ${remotes:entrouvert}/pfwbged.contacts.git pushurl=${remotes:entrouvert_push}/pfwbged.contacts.git
plone.act = git ${remotes:plone}/plone.act.git pushurl=${remotes:plone_push}/plone.act.git
plone.dexterity = git https://github.com/gbastien/plone.dexterity.git
#plone.dexterity = git https://github.com/gbastien/plone.dexterity.git

4
versions.cfg
View File

@ -4,6 +4,8 @@ Products.DocFinderTab = 1.0.5
Products.LongRequestLogger = 1.1.0
Products.PDBDebugMode = 1.3.1
aws.zope2zcmldoc = 1.1.0
collective.js.datatables = 2.0
collective.js.jqueryui = 1.8.16.9
collective.local.addgroup = 1.0
collective.local.adduser = 1.2
collective.local.sendto = 1.1.1
@ -25,4 +27,4 @@ selenium = 2.27.0
superlance = 0.7
supervisor = 3.0b1
vobject = 0.8.1c
zc.recipe.cmmi = 1.3.5
zc.recipe.cmmi = 1.3.5