Remove merge marker

pylint-dev · Feb 27, 2019 · e5fe824 · e5fe824
1 parent cee7875
commit e5fe824
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -6,7 +6,7 @@ What's New in astroid 2.2.0?
 ============================
 Release Date: TBA
 
-<<<<<<< HEAD
+
 * Fix a bug concerning inference of calls to numpy function that should not return Tuple or List
 instances.