License updates and README fix.

Author: Zachary Norman

LICENSE.txt

@@ -1,5 +1,6 @@
 The MIT License (MIT)
-Copyright (c) 2017, Exelis Visual Information Solutions, Inc.
+
+Copyright (c) 2018, Harris Geospatial Solutions, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -237,12 +237,6 @@ Create a pull request once you have made desired changes. Please try to follow t
 
 ## License
 
-Licensed under MIT. See LICENSE.txt for additional details and information.
-<<<<<<< HEAD
-
-(c) 2017 Exelis Visual Information Solutions, Inc., a subsidiary of Harris Corporation.
+(c) 2018 Harris Geospatial Solutions, Inc.
 
-=======
-
-(c) 2017 Exelis Visual Information Solutions, Inc., a subsidiary of Harris Corporation.
->>>>>>> master
+Licensed under MIT. See LICENSE.txt for additional details and information.

bridge_it__define.pro

@@ -1,5 +1,10 @@
+;h+
+; (c) 2018 Harris Geospatial Solutions, Inc.
+;
+; Licensed under MIT, see LICENSE.txt for more details.
+;h-
+
 ;+
-; (c) 2017 Exelis Visual Information Solutions, Inc., a subsidiary of Harris Corporation.
 ;
 ; :Description:
 ;   Object definition to easily manage child processes through one interface and