Remove left-over merge conflict markers

diff --git a/test/test_util.c b/test/test_util.c
index 7caa07ff297b9c108dc71fff9467875b99432fab..c499b49d86b0785c6f37365ed2309df84ccad07d 100644 (file)
--- a/test/test_util.c
+++ b/test/test_util.c
@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD
- * Copyright (C) 2010-2013 Joel Rosdahl
-=======
- * Copyright (C) 2010, 2012-2014 Joel Rosdahl
->>>>>>> maint
+ * Copyright (C) 2010-2014 Joel Rosdahl
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free