From d90fc3b71432817731032e67bd8d16374fc7af75 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 7 Nov 2018 22:57:21 -0800
Subject: Strip trailing whitespace in job_app.vue

This caused unnecessary conflicts in EE.
---
 app/assets/javascripts/jobs/components/job_app.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue
index 35104c80694..90216b04e92 100644
--- a/app/assets/javascripts/jobs/components/job_app.vue
+++ b/app/assets/javascripts/jobs/components/job_app.vue
@@ -240,16 +240,16 @@ export default {
           :erased-at="job.erased_at"
         />
 
-        <div 
+        <div
           v-if="job.archived"
           ref="sticky"
           class="js-archived-job prepend-top-default archived-sticky sticky-top"
         >
-          <icon 
+          <icon
             name="lock"
             class="align-text-bottom"
           />
-                
+
           {{ __('This job is archived. Only the complete pipeline can be retried.') }}
         </div>
         <!--job log -->
-- 
cgit v1.2.1