gistfile1.txt

sys31:empty seanhannan$ git pull
Removing public/plugin_assets/README
Removing public/plugin_assets/blacklight/images/bg.png
Removing public/plugin_assets/blacklight/images/border.png
Removing public/plugin_assets/blacklight/images/bul_sq_gry.gif
Removing public/plugin_assets/blacklight/images/checkmark.gif
Removing public/plugin_assets/blacklight/images/logo.png
Removing public/plugin_assets/blacklight/images/magnifying_glass.gif
Removing public/plugin_assets/blacklight/images/remove.gif
Removing public/plugin_assets/blacklight/images/separator.gif
Removing public/plugin_assets/blacklight/images/start_over.gif
Removing public/plugin_assets/blacklight/javascripts/accordion.js
Removing public/plugin_assets/blacklight/javascripts/application.js
Removing public/plugin_assets/blacklight/javascripts/blacklight.js
Removing public/plugin_assets/blacklight/javascripts/jquery-1.3.1.min.js
Removing public/plugin_assets/blacklight/javascripts/lightbox.js
Removing public/plugin_assets/blacklight/stylesheets/application.css
Removing public/plugin_assets/blacklight/stylesheets/yui.css
Merge made by recursive.
 config/SolrMarc/config-development.properties      |   17 ++-
 config/SolrMarc/config-production.properties       |   17 ++-
 config/SolrMarc/index.properties                   |   76 ++------
 config/SolrMarc/index_scripts/instrumentation.bsh  |    7 +-
 config/SolrMarc/index_scripts/jh_callnum.bsh       |    9 +-
 config/SolrMarc/index_scripts/jh_language.bsh      |   58 ++++++
 .../SolrMarc/index_scripts/jh_library_location.bsh |   19 ++-
 .../translation_maps/jh_locations.properties       |   43 +++++
 public/plugin_assets/README                        |    5 -
 public/plugin_assets/blacklight/images/bg.png      |  Bin 280 -> 0 bytes
 public/plugin_assets/blacklight/images/border.png  |  Bin 210 -> 0 bytes
 .../plugin_assets/blacklight/images/bul_sq_gry.gif |  Bin 45 -> 0 bytes
 .../plugin_assets/blacklight/images/checkmark.gif  |  Bin 574 -> 0 bytes
 public/plugin_assets/blacklight/images/logo.png    |  Bin 906 -> 0 bytes
 .../blacklight/images/magnifying_glass.gif         |  Bin 601 -> 0 bytes
 public/plugin_assets/blacklight/images/remove.gif  |  Bin 111 -> 0 bytes
 .../plugin_assets/blacklight/images/separator.gif  |  Bin 112 -> 0 bytes
 .../plugin_assets/blacklight/images/start_over.gif |  Bin 419 -> 0 bytes
 .../blacklight/javascripts/accordion.js            |   15 --
 .../blacklight/javascripts/application.js          |    9 -
 .../blacklight/javascripts/blacklight.js           |    3 -
 .../blacklight/javascripts/jquery-1.3.1.min.js     |   19 --
 .../blacklight/javascripts/lightbox.js             |   17 --
 .../blacklight/stylesheets/application.css         |  197 --------------------
 .../plugin_assets/blacklight/stylesheets/yui.css   |   31 ---
 solr_marc/SolrMarc.jar                             |  Bin 2265548 -> 2205685 bytes
 26 files changed, 178 insertions(+), 364 deletions(-)
 create mode 100644 config/SolrMarc/index_scripts/jh_language.bsh
 create mode 100644 config/SolrMarc/translation_maps/jh_locations.properties
 delete mode 100644 public/plugin_assets/README
 delete mode 100644 public/plugin_assets/blacklight/images/bg.png
 delete mode 100644 public/plugin_assets/blacklight/images/border.png
 delete mode 100644 public/plugin_assets/blacklight/images/bul_sq_gry.gif
 delete mode 100644 public/plugin_assets/blacklight/images/checkmark.gif
 delete mode 100644 public/plugin_assets/blacklight/images/logo.png
 delete mode 100644 public/plugin_assets/blacklight/images/magnifying_glass.gif
 delete mode 100644 public/plugin_assets/blacklight/images/remove.gif
 delete mode 100644 public/plugin_assets/blacklight/images/separator.gif
 delete mode 100644 public/plugin_assets/blacklight/images/start_over.gif
 delete mode 100644 public/plugin_assets/blacklight/javascripts/accordion.js
 delete mode 100644 public/plugin_assets/blacklight/javascripts/application.js
 delete mode 100644 public/plugin_assets/blacklight/javascripts/blacklight.js
 delete mode 100644 public/plugin_assets/blacklight/javascripts/jquery-1.3.1.min.js
 delete mode 100644 public/plugin_assets/blacklight/javascripts/lightbox.js
 delete mode 100644 public/plugin_assets/blacklight/stylesheets/application.css
 delete mode 100644 public/plugin_assets/blacklight/stylesheets/yui.css