resolve conflict

Author: dehann

LICENSE

@@ -1,13 +1,11 @@
 Copyright (c) 2017-2021 NavAbility
 
-NOTICE: this license will be relaxed to be much more permissive soon.
-
 The source code in this repository is separated into two parts 
 that are licensed separately.  The Neo4jDFG library/driver
 is licensed separately.  For more details see: 
 https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/blob/develop/src/Neo4jDFG/LICENSE
 
-DistributedFactorGraphs.jl, is not licensed for hosted, webservice or cloud 
+DistributedFactorGraphs' Neo4jDFG Driver is not licensed for hosted, webservice or cloud 
 solutions (public or private).  Please contact NavAbility via email at 
 <[email protected]> for clarification or additional licensing options.
 NavAbility reserves all rights regarding, and to deny use of the software 
@@ -20,7 +18,7 @@ according to terms defined by Apache 2.0 or other library specifc licenses.
 
    Copyright 2017-2021 NavAbility
 
-   Licensed under a Market Limited version of the Apache License, Version 2.0 (the "License");
+   Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
 
    Unless required by applicable law or agreed to in writing, software

src/Neo4jDFG/LICENSE

@@ -1,8 +1,9 @@
 Copyright (c) 2017-2020 NavAbility
 
-DistributedFactorGraphs.jl is not licensed for hosted, webservice or cloud 
-solutions (public or private).  Please contact NavAbility via email at 
-<[email protected]> for clarification or additional licensing options.
+DistributedFactorGraphs' Neo4jDFG driver is not licensed for hosted, 
+webservice or cloud solutions (public or private) -- i.e. dual-licensed.  
+Please contact NavAbility via email at <[email protected]> for 
+clarification or additional licensing options.
 NavAbility reserves all rights regarding, and to deny use of the software 
 for hosted webservice or cloud offerings or deployments; over and above 
 any conflicts that may arise with the LGPLv3 license copied hereafter.
@@ -42,7 +43,7 @@ SOFTWARE.
 the terms and conditions of version 3 of the GNU General Public
 License, supplemented by the additional permissions listed below.
 
-  0. Additional Definitions.
+  1. Additional Definitions.
 
   As used herein, "this License" refers to version 3 of the GNU Lesser
 General Public License, and the "GNU GPL" refers to version 3 of the GNU