X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fverifier%2Fclass_UserGuestVerifierFilter.php;fp=framework%2Fmain%2Fclasses%2Ffilter%2Fverifier%2Fclass_UserGuestVerifierFilter.php;h=c6ec0215fa03442528a7b8e351aa9d3c7539421b;hp=9e559c6e49b58c00e424acf9060067e5add0039b;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630;ds=sidebyside

diff --git a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
index 9e559c6e..c6ec0215 100644
--- a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
@@ -16,7 +16,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.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/classes/filter/verifier/class_UserGuestVerifierFilter.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *