Some updates:

[core.git] / framework / main / interfaces / streams / crypto / class_EncryptableStream.php

diff --git a/framework/main/interfaces/streams/crypto/class_EncryptableStream.php b/framework/main/interfaces/streams/crypto/class_EncryptableStream.php
index 7f20dc669e4f3b9f0079bb0bd9aa82ab0993c118..9f95492e414722fbbeb7bb6b53254a2d15fd6eeb 100644 (file)
--- a/framework/main/interfaces/streams/crypto/class_EncryptableStream.php
+++ b/framework/main/interfaces/streams/crypto/class_EncryptableStream.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stream\Stream;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/streams/crypto/class_EncryptableStream.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/streams/crypto/class_EncryptableStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *