index.md

uw-ne · Feb 13, 2018 · 4573843 · 4573843
1 parent 49a2e2c
commit 4573843
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/index.md b/index.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # list of included elements
 
 * Hydrogen (Z=1)