From 605b4dca22bb01b6283db4c0a253c9f69f6ea765 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Mon, 18 Jun 2018 18:09:59 -0400
Subject: [PATCH] fix overlooked merge conflict

---
 doc/src/pair_meam_spline.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/doc/src/pair_meam_spline.txt b/doc/src/pair_meam_spline.txt
index 086854a0eb..6653b397a0 100644
--- a/doc/src/pair_meam_spline.txt
+++ b/doc/src/pair_meam_spline.txt
@@ -164,9 +164,5 @@ for more info.
 Kress, Modelling Simulation Materials Science Engineering, 8, 825
 (2000).
 
-<<<<<<< HEAD
 :link(Zhang4)
-=======
-:link(Zhang2)
->>>>>>> Documentation V1
 [(Zhang)] Zhang and Trinkle, Computational Materials Science, 124, 204-210 (2016).
-- 
GitLab