Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mattss committed May 1, 2014
2 parents 9201d57 + b010ab8 commit c615b8e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion buildout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extensions = mr.developer
auto-checkout = collective.workspace

[sources]
collective.workspace = git https://github.com/collective/collective.workspace.git
collective.workspace = git git@github.com:ploneintranet/collective.workspace.git

[omelette]
recipe = collective.recipe.omelette
Expand Down
4 changes: 2 additions & 2 deletions travis.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[buildout]
extends =
extends =
buildout.cfg
https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg
package-name = ploneintranet.workspace
Expand All @@ -11,7 +11,7 @@ parts +=


[sources]
collective.workspace = git https://github.com/collective/collective.workspace.git
collective.workspace = git https://github.com/ploneintranet/collective.workspace.git

[flake8]
recipe = zc.recipe.egg
Expand Down

0 comments on commit c615b8e

Please sign in to comment.