ffix conflict

This commit is contained in:
numbbbbb
2014-06-11 14:51:41 +08:00
43 changed files with 781 additions and 308 deletions

View File

@ -46,7 +46,7 @@
<div class="book" data-level="3.6" data-basepath=".." data-revision="1402451678088">
<div class="book" data-level="3.6" data-basepath=".." data-revision="1402469309776">
<div class="book-header">
<!-- Actions Left -->
<a href="#" class="btn pull-left toggle-summary" aria-label="Toggle summary"><i class="fa fa-align-justify"></i></a>