From 8c58af1c553a73def5760f2ad3c063b623f33f66 Mon Sep 17 00:00:00 2001
From: Lukas Mueller <lam87@cornell.edu>
Date: Thu, 10 Dec 2015 20:47:43 -0500
Subject: [PATCH] fix conflict

---
 sgn.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sgn.conf b/sgn.conf
index b45af6057..899dde9ab 100644
--- a/sgn.conf
+++ b/sgn.conf
@@ -14,6 +14,10 @@ project_name SGN
 
 disable_login 0
 
+# the species that should be preselected in a list of species
+#
+preferred_species	Solanum lycopersicum
+
 # who is the web server user for chowning and emailing.  need to set
 # these manually under Apache mod_perl for example, because the server
 # runs under a different user than when it starts.
@@ -249,5 +253,5 @@ archive_path     /export/prod/sgn_archive
 identifier_prefix   SGN
 
 #default genotyping protocol to use:
-default_genotyping_protocol undefined
 
+default_genotyping_protocol undefined
-- 
2.11.4.GIT