projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed Registry -> GenericRegistry to make it clear that this registry does
[core.git]
/
framework
/
main
/
exceptions
/
main
/
class_InvalidCommandException.php
diff --git
a/framework/main/exceptions/main/class_InvalidCommandException.php
b/framework/main/exceptions/main/class_InvalidCommandException.php
index 965e3609064e42e869b13132ca8537bbe57e83d0..ca84cd071dd5600d1a9236eeb899c6d6c0284cb8 100644
(file)
--- a/
framework/main/exceptions/main/class_InvalidCommandException.php
+++ b/
framework/main/exceptions/main/class_InvalidCommandException.php
@@
-10,11
+10,7
@@
use Org\Mxchange\CoreFramework\Generic\FrameworkException;
*
* @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
*
* @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_InvalidCommandException.php
* @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
* @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/main/class_InvalidCommandException.php
* @license GNU GPL 3.0 or any newer version
* @link http://www.shipsimu.org
*
* @license GNU GPL 3.0 or any newer version
* @link http://www.shipsimu.org
*