diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
| commit | a4927fc05a710cee6217d8a40ce925d5f894fd8f (patch) | |
| tree | 83909e1d903afbf49d50182af79a679442632975 /vendor/plugins/acts_as_xapian/init.rb | |
| parent | cc27fe66a13fe1504711c64ce5530a1c178e907d (diff) | |
| parent | cc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff) | |
Merge branch 'release/0.6.7' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'vendor/plugins/acts_as_xapian/init.rb')
| -rw-r--r-- | vendor/plugins/acts_as_xapian/init.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vendor/plugins/acts_as_xapian/init.rb b/vendor/plugins/acts_as_xapian/init.rb index 20b7b24a5..36b43ac0b 100644 --- a/vendor/plugins/acts_as_xapian/init.rb +++ b/vendor/plugins/acts_as_xapian/init.rb @@ -2,8 +2,6 @@ # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: init.rb,v 1.1 2008-04-23 13:33:50 francis Exp $ require 'acts_as_xapian' |