fix conflict, merge

smnorris · Jun 13, 2024 · faad008 · faad008
2 parents 6d36796 + 4ed1a4e
commit faad008
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/db/bcfishpass/reports/auto_rank.py b/db/bcfishpass/reports/auto_rank.py
@@ -163,7 +163,11 @@ def runQuery(condition, conn):
             AND all_spawningrearing_belowupstrbarriers_km  IS NOT NULL
             AND all_spawningrearing_belowupstrbarriers_km  != 0
             AND {condition}
+<<<<<<< HEAD
             AND barriers_{species}_dnstr = '';
+=======
+            AND barriers_{species}_dnstr = ''
+>>>>>>> 4ed1a4e42dff561a6751e38728950003f919d782
 
             ALTER TABLE IF EXISTS bcfishpass.ranked_barriers
                 RENAME COLUMN aggregated_crossings_id TO id;
@@ -453,6 +457,7 @@ def main():
     parser = makeParser()
     args = parser.parse_args()
     condition = buildCondition(args.wcrp[0])
+<<<<<<< HEAD
     p = urlparse(os.environ["DATABASE_URL"])
     pg_conn_dict = {
         'dbname': p.path[1:],
@@ -462,6 +467,9 @@ def main():
         'host': p.hostname
     }
     conn = pg2.connect(**pg_conn_dict)
+=======
+    conn = pg2.connect(os.environ["DATABASE_URL"])
+>>>>>>> 4ed1a4e42dff561a6751e38728950003f919d782
     runQuery(condition, conn)
     print("Done!")