Merge branch 'master' of https://github.com/NsTremblay/newick

Conflicts: README.md
NsTremblay · Jun 22, 2015 · aa16423 · aa16423
2 parents 076456b + 14bcab2
commit aa16423
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 eNwick
+=======
+Nk
+>>>>>>> 14bcab23d686497752a4ade4dd3cf97f7c263ab2
 ======