Resolve conflicts with upstream repository
authorscollett <stephanie.collett@ucop.edu>
Mon, 16 Nov 2009 18:27:53 +0000 (10:27 -0800)
committerscollett <stephanie.collett@ucop.edu>
Mon, 16 Nov 2009 18:27:53 +0000 (10:27 -0800)
commitbd20f0960a8d24bd40949578fdea8b2fa45dab91
tree44b45481ec4b173944acc42293f9669e6569d86b
parentadb879b083b8a3fb1f982b099a94c37aa1544125
parent1426267ededc793dcfdf687c1b40d39521772a7f
Resolve conflicts with upstream repository
GnuBook/GnuBook.css
GnuBook/GnuBook.js