From 230db2d8db54f9bd7f28169f4ce6b763304f2647 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Sat, 5 Dec 2015 06:57:37 +0000
Subject: Remove strayed conflict indicator

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 30c520c..0b4c5f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,7 +44,6 @@
 	* NEWS: Document COMPATINCLUDEDIR.
 	* README: Likewise.
 
->>>>>>> 1.102
 2014-02-12  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* src/gdbmimp.c (gdbm_import_from_file): Read record sizes as
-- 
cgit v1.2.1