X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fuser%2Fclass_UserPasswordMismatchException.php;h=c039a3b4abe2d21d5fc54b79a878f27f9feab7fd;hb=b002c5909aa0f781505dde5414964b0f014cde01;hp=bfb6934a88d3759e22872856b584bb1d3b76e752;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13;p=core.git

diff --git a/framework/main/exceptions/user/class_UserPasswordMismatchException.php b/framework/main/exceptions/user/class_UserPasswordMismatchException.php
index bfb6934a..c039a3b4 100644
--- a/framework/main/exceptions/user/class_UserPasswordMismatchException.php
+++ b/framework/main/exceptions/user/class_UserPasswordMismatchException.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/user/class_UserPasswordMismatchException.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/user/class_UserPasswordMismatchException.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *