resolving merge conflict
authorJane Sandberg <sandbej@linnbenton.edu>
Tue, 15 Mar 2016 18:50:30 +0000 (11:50 -0700)
committerJane Sandberg <sandbej@linnbenton.edu>
Tue, 26 Apr 2016 17:06:48 +0000 (10:06 -0700)
commita1c5ca3c4eb722fd814e5044de56d9be76506c03
treed6718db24e9772c58d65349bb20194ddc2de080e
parentb51c2799600c2e154591e41b657a61c306bcd35b
resolving merge conflict

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
docs/cataloging/cataloging_web_client.txt [new file with mode: 0644]
docs/root.txt