Some updates:

[core.git] / framework / main / interfaces / io / pointer / io / class_InputOutputPointer.php

diff --git a/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php b/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
index 4d361616469f9caf4a8035c9767e69437d6f3a43..ea71870042eda55b73abd3852e8751d2c0804778 100644 (file)
--- a/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
+++ b/framework/main/interfaces/io/pointer/io/class_InputOutputPointer.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Filesystem\Pointer\OutputPointer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/pointer/io/class_InputOutputPointer.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/interfaces/io/pointer/io/class_InputOutputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *