Merge pull request #34 from Humeira/master

fixed a wrong merge

Author: MachinisteWeb

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>