aboutsummaryrefslogtreecommitdiffstats
path: root/examples/example.html
diff options
context:
space:
mode:
Diffstat (limited to 'examples/example.html')
-rw-r--r--examples/example.html7
1 files changed, 1 insertions, 6 deletions
diff --git a/examples/example.html b/examples/example.html
index e08fb69..5b8d288 100644
--- a/examples/example.html
+++ b/examples/example.html
@@ -180,14 +180,9 @@
</ul>
<h3 id="Links14">Links</h3>
<p>
-<<<<<<< HEAD
+
<a href="http://www.google.com">Google</a>
<!-- Images produce correct HTML but don't display in VS Code-->
-=======
- <a href="www.google.com">Google</a>
- </p>
- <p>
->>>>>>> htmlgen
<img src="test_img.jpg" alt="image">
</p>
<h2 id="LateX_maths15">LateX maths</h2>