From 6a13b372224a5f7ae03dde92f455645441b62f84 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 7 Apr 2016 15:32:46 +0100 Subject: Fixed missed conflict --- app/assets/javascripts/merge_request_widget.js.coffee | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index a522f9189ab..065626beeb8 100644 --- 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 -- cgit v1.2.1