fixing merge conflicts

andreasprlic · andreasprlic · commit 060079e0e7ef · 2016-04-08T23:10:36.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,22 @@
+*.gem
+*.swp
+*~
+.DS_Store
+.analysis
+.bundle/
+.byebug_history
+.jekyll-metadata
+.ruby-gemset
+.ruby-version
+.sass-cache
+/test/source/file_name.txt
+/vendor
+Gemfile.lock
+_site/
+bbin/
+coverage
+gh-pages/
+pkg/
+site/_site/
+test/dest
+tmp/*
diff --git a/_wikis/BioJava:CookBook3:MSA.md b/_wikis/BioJava:CookBook3:MSA.md
@@ -1,5 +1,6 @@
 ---
 title: BioJava:CookBook3:MSA
+layout: default
 ---
 
 How to create a Multiple Sequence Alignment in BioJava
diff --git a/_wikis/BioJava:CookBook:Interfaces:ViewAsTree.md b/_wikis/BioJava:CookBook:Interfaces:ViewAsTree.md
