From d22c71d30ee60ceff26dc32db47daa57cf300df5 Mon Sep 17 00:00:00 2001
From: Tramy Nguyen <tramy.nguy@gmail.com>
Date: Tue, 28 Feb 2017 14:28:58 -0700
Subject: [PATCH] Updated license from MIT to Apache

---
 LICENSE.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 7d6153f86..6b0b1270f 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -199,8 +199,5 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-<<<<<<< HEAD
    limitations under the License.
-=======
-   limitations under the License.
->>>>>>> branch 'master' of https://github.com/MyersResearchGroup/iBioSim.git
+