From 0dd38aa9cb8fcdc0efae73d714abdaa52b99e8e4 Mon Sep 17 00:00:00 2001
From: Humeira Diljore <hello@echdee.me>
Date: Sun, 26 Feb 2017 20:29:28 +0400
Subject: [PATCH] fixed a wrong merge

---
 themes/vue/layout/index.ejs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/themes/vue/layout/index.ejs b/themes/vue/layout/index.ejs
index 58ee7b69fd..cf0e78e821 100644
--- a/themes/vue/layout/index.ejs
+++ b/themes/vue/layout/index.ejs
@@ -49,11 +49,7 @@
     <h3>FIÈREMENT SPONSORISÉ PAR</h3>
     <%- partial('partials/sponsors') %>
     <br>
-<<<<<<< HEAD
     <a class="become-sponsor button white" href="/support-vuejs/">Apporter son soutien</a>
-=======
-    <a class="become-sponsor button white" href="<%- url_for("/support-vuejs/") %>">Become a Backer</a>
->>>>>>> upstream/master
   </div>
 </div>