summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/monitoring/components/graph/track_line.vue
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-10-10 01:27:42 -0500
committerMike Greiling <mike@pixelcog.com>2018-10-10 02:30:25 -0500
commit56914c1ac94c02ee336db5014649777d9d729711 (patch)
tree080cf7410d2a8e146bb1ab73b87bea33c6538a08 /app/assets/javascripts/monitoring/components/graph/track_line.vue
parentf7a3e8ff53449bc4ad4a19b3df5a6d19f391b180 (diff)
downloadgitlab-ce-56914c1ac94c02ee336db5014649777d9d729711.tar.gz
Prettify merge_conflicts monitoring and notebook modules
Diffstat (limited to 'app/assets/javascripts/monitoring/components/graph/track_line.vue')
-rw-r--r--app/assets/javascripts/monitoring/components/graph/track_line.vue1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/monitoring/components/graph/track_line.vue b/app/assets/javascripts/monitoring/components/graph/track_line.vue
index ba3f93b39ff..e04fd9c1f35 100644
--- a/app/assets/javascripts/monitoring/components/graph/track_line.vue
+++ b/app/assets/javascripts/monitoring/components/graph/track_line.vue
@@ -33,4 +33,3 @@ export default {
</svg>
</td>
</template>
-