projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c49fe46) | patch
Lp 1731021: Clean up on aisle 9! user/dyrcona/LP1731021_fine_item_detail
authorJason Stephenson <jason@sigio.com>
Wed, 20 Jun 2018 17:06:43 +0000 (13:06 -0400)
committerJason Stephenson <jason@sigio.com>
Wed, 20 Jun 2018 17:06:43 +0000 (13:06 -0400)
commit17ea61134e2e269ebe0e8894b4e98704d5214668
tree8ced57ecd25227410f0623a01caa19ea5fae7a77tree
parentc49fe46f80e6db2f6b3ef88dd7fa7785038226edcommit | diff
Lp 1731021: Clean up on aisle 9!

Get rid of conflict markers and trailing whitespace in Dan's previous
commit.

Signed-off-by: Jason Stephenson <jason@sigio.com>
Open-ILS/examples/oils_sip.xml.example diff | blob | history
Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm diff | blob | history
Evergreen ILS