minor fixes

Becksteinlab · Sep 25, 2015 · 638f404 · 638f404
1 parent a681d67
commit 638f404
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/hop/g_flux.py b/hop/g_flux.py
@@ -47,7 +47,6 @@ def track_counts(topology,trajectory,water_label,protein_label,in_top,in_bottom,
                 time_elapsed=0
             for water_index in xrange(len(water_z)):
                 if water_z[water_index]>=in_top:
-<<<<<<< HEAD
                     tracking_list[water_index]=1
                     if tracking_list_last[water_index]==-2:
                         counts_up+=1