Evergreen

  1. Bug #857572
  2. Comment #3

Comment 3 for bug 857572

Revision history for this message
Jason Stephenson (jstephenson) wrote :

When I merge into a fresh checkout of master at 2011-09-30 13:38-0400, I get the following:

jason@jason:~/Src/Evergreen$ git merge working/user/dbs/tpac_semantic_amazon_record_details
Auto-merging Open-ILS/src/templates/opac/parts/searchbar.tt2
CONFLICT (content): Merge conflict in Open-ILS/src/templates/opac/parts/searchbar.tt2
Automatic merge failed; fix conflicts and then commit the result.

Looks like there is now a conflict with commit f3bed157bc524e5c88e07407fc56b1bfb8998406