From 2bd1e46ab97b9e82669020ea37b58766efc847af Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 18 Nov 2013 11:54:39 +0100 Subject: [PATCH] Remove left-over merge hunk --- DataStructures/SearchEngine.h | 1 - 1 file changed, 1 deletion(-) diff --git a/DataStructures/SearchEngine.h b/DataStructures/SearchEngine.h index ebd838bf8..e0fb41db7 100644 --- a/DataStructures/SearchEngine.h +++ b/DataStructures/SearchEngine.h @@ -12,7 +12,6 @@ Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -<<<<<<< HEAD THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE