EbookFoundation
/
autocat3
mirror of https://github.com/EbookFoundation/autocat3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "left changes in autocat3. commit to test" 

This reverts commit 2d9caf77ad.

Conflicts:
	templates/site-layout.html
bookshelf_change
autocat 2020-05-29 15:03:03 -04:00
parent a231e94962
commit 99080fab29
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/site-layout.html
View File

@ -34,6 +34,7 @@ var dialog_title = "${os.user_dialog[1]}";
var dialog_message = "${os.user_dialog[0]}";
//]]></script>
<<<<<<< HEAD
<<<<<<< HEAD
<!--<script
src="/js/pg-desktop-one.js?${cherrypy.config['js_mtime']}" />-->
@ -41,6 +42,10 @@ src="/js/pg-desktop-one.js?${cherrypy.config['js_mtime']}" />-->
<script type="text/javascript"
src="/js/pg-desktop-one.js?${cherrypy.config['js_mtime']}" />
>>>>>>> parent of 0253c43... merge changes from master and keep former change
=======
<script
src="/js/pg-desktop-one.js?${cherrypy.config['js_mtime']}" />
>>>>>>> parent of 2d9caf7... left changes in autocat3. commit to test
<link rel="shortcut icon" href="/gutenberg/favicon" />
<link rel="canonical" href="${os.canonical_url}" />