Fixed missed conflict

2016-04-07 15:32:46 +01:00 · 2016-04-07 15:32:46 +01:00 · 6a13b37222
parent 843bc44aa9
commit 6a13b37222
1 changed files with 0 additions and 4 deletions
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@ -72,15 +72,11 @@ class @MergeRequestWidget
        @firstCICheck = false
        @opts.ci_status = data.status

-<<<<<<< a918e8bf277418048776a5d9c34a64b39f4e56f3
      if @opts.ci_status is ''
        @opts.ci_status = data.status
        return

-      if data.status isnt @opts.ci_status
-=======
      if data.status isnt @opts.ci_status and data.status?
->>>>>>> Build notification null check
        @showCIStatus data.status
        if data.coverage
          @showCICoverage data.coverage