Fix compilation error due to the previous wrong forward merge

neo4j · May 22, 2018 · 4047c7a · 4047c7a
1 parent 1fd00b6
commit 4047c7a
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/Neo4j.Driver/Neo4j.Driver.Tests/TestUtil/CollectionExtensionsTests.cs b/Neo4j.Driver/Neo4j.Driver.Tests/TestUtil/CollectionExtensionsTests.cs
@@ -1,10 +1,7 @@
 // Copyright (c) 2002-2018 "Neo4j,"
 // Neo4j Sweden AB [http://neo4j.com]
-<<<<<<< HEAD
 //
-=======
-// 
->>>>>>> 1.5
+//
 // This file is part of Neo4j.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");