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:32:50 +01:00
parent d47814e29f
commit b633c6c7fa
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@ -47,11 +47,7 @@
<li class="dropdown-submenu"><a href="#"><i
class="icon-gdrive"></i> Google Drive</a>
<ul class="dropdown-menu">
<<<<<<< HEAD
<li><a href="#" class="action-upload-gdrive">Export to
=======
<li><a class="action-upload-gdrive" href="#">Export to
>>>>>>> branch 'gh-pages' of https://github.com/benweet/stackedit.git
Google Drive</a></li>
<li><a href="#" data-toggle="modal"
data-target="#modal-download-gdrive">Import from Google