Resolve conflict
This commit is contained in:
parent
b633c6c7fa
commit
5a21306f27
@ -1 +1 @@
|
||||
CACHE MANIFEST
# v6
CACHE:
index.html
css/bootstrap.css
css/jgrowl.css
css/main.css
js/prod/custo.js
js/async-runner.js
js/bootstrap.js
js/config.js
js/gdrive.js
js/jgrowl.js
js/jquery.js
js/jquery-ui.js
js/layout.js
js/main.js
js/Markdown.Converter.js
js/Markdown.Editor.js
js/Markdown.Sanitizer.js
js/require.js
js/synchronizer.js
img/ajax-loader.gif
img/dropbox.png
img/gdrive.png
img/glyphicons-halflings.png
img/glyphicons-halflings-white.png
img/stackedit-16.png
img/stackedit-32.ico
NETWORK:
*
|
||||
CACHE MANIFEST
# v7
CACHE:
index.html
css/bootstrap.css
css/jgrowl.css
css/main.css
js/prod/custo.js
js/async-runner.js
js/bootstrap.js
js/config.js
js/gdrive.js
js/jgrowl.js
js/jquery.js
js/jquery-ui.js
js/layout.js
js/main.js
js/Markdown.Converter.js
js/Markdown.Editor.js
js/Markdown.Sanitizer.js
js/require.js
js/synchronizer.js
img/ajax-loader.gif
img/dropbox.png
img/gdrive.png
img/glyphicons-halflings.png
img/glyphicons-halflings-white.png
img/stackedit-16.png
img/stackedit-32.ico
NETWORK:
*
|
||||
|
Loading…
Reference in New Issue
Block a user