From b633c6c7fa4330ed9c7cf08257c8adac9ed523a6 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit.schweblin@morpho.com>
Date: Thu, 4 Apr 2013 20:32:50 +0100
Subject: [PATCH] Resolve conflict

---
 index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/index.html b/index.html
index 05a59545..2525e22f 100644
--- a/index.html
+++ b/index.html
@@ -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