X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fresult%2Fclass_InvalidDatabaseResultException.php;h=3901ef8fed18bf74a274c70105da5e4f2abb8563;hp=fccf81994b543f62160c904ddf4796edd1066fa4;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/exceptions/result/class_InvalidDatabaseResultException.php b/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
index fccf8199..3901ef8f 100644
--- a/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
+++ b/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/exceptions/result/class_InvalidDatabaseResultException.php
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/exceptions/result/class_InvalidDatabaseResultException.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *