[ckan-changes] [okfn/ckan] c8af25: Remove some lines of code that have somehow crept ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: c8af251922225f8cf2057d1a946e66d4ca898305
      https://github.com/okfn/ckan/commit/c8af251922225f8cf2057d1a946e66d4ca898305
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Remove some lines of code that have somehow crept back in during some merges


  Commit: b83207b005c2a54dcb477fc32f8bce0eb10a12f1
      https://github.com/okfn/ckan/commit/b83207b005c2a54dcb477fc32f8bce0eb10a12f1
  Author: kindly <kindly at gmail.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Merge pull request #207 from okfn/merge-fix

[Trivial] Remove some lines of code that have somehow crept back in during some merges


Compare: https://github.com/okfn/ckan/compare/fe54ab091331...b83207b005c2