merge conflicting on stripping spaces
[librarian.git] / librarian / res / logo.png
librarian/res/logo.png