Skip to content

Commit

Permalink
Merge branch 'master' of github.com:okfn/ckan into defect-1470-user-name
Browse files Browse the repository at this point in the history
  • Loading branch information
amercader committed Nov 16, 2011
2 parents ad29e3e + a3b4c05 commit 6744cc9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pip-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#
# pip install --ignore-installed -r pip-requirements.txt

-e hg+https://bitbucket.org/okfn/ckan@default#egg=ckan
-e git+https://github.com/okfn/ckan@master#egg=ckan
# CKAN dependencies
-r https://bitbucket.org/okfn/ckan/raw/default/requires/lucid_conflict.txt
-r https://bitbucket.org/okfn/ckan/raw/default/requires/lucid_present.txt
-r https://bitbucket.org/okfn/ckan/raw/default/requires/lucid_missing.txt
-r https://github.com/okfn/ckan/raw/master/requires/lucid_conflict.txt
-r https://github.com/okfn/ckan/raw/master/requires/lucid_present.txt
-r https://github.com/okfn/ckan/raw/master/requires/lucid_missing.txt

# NOTE: Developers, please do not edit this file. Changes should go in the
# appropriate files in the `requires' directory.

0 comments on commit 6744cc9

Please sign in to comment.