Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / exceptions / user / class_AccountPasswordMismatchException.php

diff --git a/framework/main/exceptions/user/class_AccountPasswordMismatchException.php b/framework/main/exceptions/user/class_AccountPasswordMismatchException.php
index 65b3a9e8802edeac280677ffe3c63315fbe13ec7..73ac7bd90bb7498d02556e2011562412168f3b4f 100644 (file)
--- a/framework/main/exceptions/user/class_AccountPasswordMismatchException.php
+++ b/framework/main/exceptions/user/class_AccountPasswordMismatchException.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/user/class_AccountPasswordMismatchException.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_AccountPasswordMismatchException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *