Some updates:

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

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