--- OSAS/OSA_system/OSAS_ids.old.py	2004/03/03 13:02:54	1.1
+++ OSAS/OSA_system/OSAS_ids.old.py	2005/11/04 16:42:48	1.2
@@ -39,12 +39,12 @@ class OSAS_idGenerator(SimpleItem):
         if self.idExists(id):
             return "ERROR: id - %s - already exists" %id
         
-<<<<<<< OSAS_ids.py
-        conn=PgSQL.connect("127.0.0.1 dbname=osas_ids user=dwinter")
 
-=======
+        #conn=PgSQL.connect("127.0.0.1 dbname=osas_ids user=dwinter")
+
+
         conn=PgSQL.connect("127.0.0.1:osas_ids:dwinter")
->>>>>>> 1.4
+
         curs=conn.cursor()
 
         curs.execute("INSERT INTO institutesIds (id,date,name)  VALUES ('%s','%s','%s')" % (id,date,name))