caojiezi2003/Stackedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflict

Browse Source
This commit is contained in:
Benoit Schweblin 2013-04-04 20:36:05 +01:00
parent 5a21306f27
commit a8d7028050
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.manifest
View File

@ -1 +1 @@
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: *
CACHE MANIFEST # v8 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: *

26
index.html
View File

@ -149,11 +149,7 @@
<a class="btn action-manual-gdrive" data-dismiss="modal"><i class="icon-ok"></i></a>
</div>
<p class="muted"><b>NOTE:</b> Adding a synchronized location will
<<<<<<< HEAD
first upload the local document and overwrite the existing file on the
=======
first upload the local document and overwrite the file on the
>>>>>>> branch 'gh-pages' of https://github.com/benweet/stackedit.git
server.</p>
</div>
<div class="modal-footer">
@ -226,7 +222,6 @@
<dd>
</dl>
<dl>
<<<<<<< HEAD
<dt>Credit:</dt>
<dd>
<a target="_blank" href="http://twitter.github.com/bootstrap/">Bootstrap</a>
@ -249,27 +244,6 @@
</dd>
<dd>
<a target="_blank" href="http://requirejs.org/">RequireJS</a>
=======
<dt>Credits:</dt>
<dd>
<a target="_blank" href="http://jquery.com/">jQuery</a>
</dd>
<dd>
<a target="_blank" href="http://twitter.github.com/bootstrap/">Bootstrap</a>
</dd>
<dd>
<a target="_blank" href="http://requirejs.org/">RequireJS</a>
</dd>
<dd>
<a target="_blank" href="https://code.google.com/p/pagedown/">PageDown</a>
</dd>
<dd>
<a target="_blank" href="http://layout.jquery-dev.net/">UI
Layout</a>
</dd>
<dd>
<a target="_blank" href="https://github.com/stanlemon/jGrowl/">jGrowl</a>
>>>>>>> branch 'gh-pages' of https://github.com/benweet/stackedit.git
</dd>
</dl>
<p>Copyright 2013 <a target="_blank"