fix bug

tensorlayer · May 7, 2020 · f67492b · f67492b
1 parent b3b62c3
commit f67492b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/rlzoo/algorithms/dppo_clip/dppo_clip.py b/rlzoo/algorithms/dppo_clip/dppo_clip.py
@@ -379,9 +379,5 @@ def work(self):
                     time.time() - t0
                 )
             )
-<<<<<<< HEAD
-
-=======
             if self.wid == 0 and self.plot_func is not None:
                 self.plot_func(GLOBAL_RUNNING_R)
->>>>>>> RLBench