]> git.evergreen-ils.org Git - working/Evergreen.git/commit
projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d04e4ce) | patch
TPAC: Resolve conflict with master
authorDan Scott <dan@coffeecode.net>
Tue, 27 Dec 2011 23:36:32 +0000 (18:36 -0500)
committerJason Stephenson <jstephenson@mvlc.org>
Thu, 29 Dec 2011 15:13:34 +0000 (10:13 -0500)
commitc3583b4788574ad6b940f447b69c303c1c7810f0
tree65e017e7ae0404477d5359611858c9e04cfe3b7ftree
parentd04e4cea8ffbd0e9e9ab5bb11fa6e4b60c3443c5commit | diff
TPAC: Resolve conflict with master

The changes for LP909111 ended up causing a conflict with this branch.
Resolve!

Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm diff | blob | history
Evergreen ILS