Revert instance.md

Signed-off-by: MachinisteWeb <bruno.lesieur@gmail.com>
vuejs · sdras · Jun 17, 2018 · Oct 14, 2017 · Oct 14, 2017 · Oct 14, 2017
commit 60e5b8ad428d2bfdf709a49bb103ab4908538897
diff --git a/src/v2/guide/instance.md b/src/v2/guide/instance.md
@@ -97,11 +97,7 @@ new Vue({
 <div id="app">
   <p>{{ foo }}</p>
   <!-- this will no longer update `foo`! -->
-<<<<<<< HEAD
-  <button @click="foo = 'baz'">Change it</button>
-=======
   <button v-on:click="foo = 'baz'">Change it</button>
->>>>>>> 4a734c253ec659b3ce203d585d201472e4226b06
 </div>
 ```