Fix bad conflict resolution

d614a9c3 · Lin Jen-Shin · a050fc8e · d614a9c3
Commit d614a9c3 authored Apr 11, 2017 by Lin Jen-Shin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

app/models/ci/pipeline.rb app/models/ci/pipeline.rb +0 -1

No files found.
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -237,7 +237,6 @@ module Ci
          job.cancel
        end
    end
-    end
    def auto_cancel_running(pipeline)
      update(auto_canceled_by: pipeline)