From 2d97c608eba99b355283708a1fa582f9d40d4c06 Mon Sep 17 00:00:00 2001
From: Glenn Proctor <gp1@sanger.ac.uk>
Date: Tue, 1 Mar 2005 10:17:42 +0000
Subject: [PATCH] *** empty log message ***

---
 misc-scripts/xref_mapping/sql/populate_metadata.sql | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/misc-scripts/xref_mapping/sql/populate_metadata.sql b/misc-scripts/xref_mapping/sql/populate_metadata.sql
index b59d109c54..734133824e 100644
--- a/misc-scripts/xref_mapping/sql/populate_metadata.sql
+++ b/misc-scripts/xref_mapping/sql/populate_metadata.sql
@@ -138,15 +138,12 @@ INSERT INTO source_url (source_id, species_id, url, checksum, file_modified_date
 ##      IPI
 INSERT INTO source_url (source_id, species_id, url, checksum, file_modified_date, upload_date, parser) VALUES (5, 10116,'ftp://ftp.ebi.ac.uk/pub/databases/IPI/current/ipi.RAT.fasta.gz', '', now(), now(), "IPIParser");
 
-##      UniGene
-<<<<<<< populate_metadata.sql
-##INSERT INTO source_url (source_id, species_id, url, checksum, file_modified_date, upload_date, parser) VALUES (6, 10116,'ftp://ftp.ncbi.nih.gov/repository/UniGene/Rn.seq.uniq.gz ftp://ftp.ncbi.nih.gov/repository/UniGene/Rn.data.gz', '', now(), now(), "UniGeneParser");
-
 ##      Interpro
 INSERT INTO source_url (source_id, species_id, url, checksum, file_modified_date, upload_date, parser) VALUES (1300, 10116,'ftp://ftp.ebi.ac.uk/pub/databases/interpro/interpro.xml.gz', '', now(), now(), "InterproParser");
-=======
+
+##      UniGene
 ##INSERT INTO source_url (source_id, species_id, url, checksum, file_modified_date, upload_date, parser) VALUES (6, 10116,'ftp://ftp.ncbi.nih.gov/repository/UniGene/Rn.seq.uniq.gz ftp://ftp.ncbi.nih.gov/repository/UniGene/Rn.data.gz', '', now(), now(), "UniGeneParser");
->>>>>>> 1.29
+
 
 ###Zebrafish
 ##      uniprot
-- 
GitLab