From 1eaad45e71fd706a69c06b59fba0d82628c53232 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Fri, 12 Aug 2016 21:36:55 +0300
Subject: [PATCH] Remove unnecessary window exports.

---
 app/assets/javascripts/merge_conflict_data_provider.js.es6 | 4 ++--
 app/assets/javascripts/merge_conflict_resolver.js.es6      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/merge_conflict_data_provider.js.es6 b/app/assets/javascripts/merge_conflict_data_provider.js.es6
index 0abee3a000f..a96c57d1be0 100644
--- a/app/assets/javascripts/merge_conflict_data_provider.js.es6
+++ b/app/assets/javascripts/merge_conflict_data_provider.js.es6
@@ -1,10 +1,10 @@
 const HEAD_HEADER_TEXT    = 'HEAD//our changes';
 const ORIGIN_HEADER_TEXT  = 'origin//their changes';
-
 const HEAD_BUTTON_TITLE   = 'Use ours';
 const ORIGIN_BUTTON_TITLE = 'Use theirs';
 
-window.MergeConflictDataProvider = class MergeConflictDataProvider {
+
+class MergeConflictDataProvider {
 
   getInitialData() {
     const diffViewType = $.cookie('diff_view');
diff --git a/app/assets/javascripts/merge_conflict_resolver.js.es6 b/app/assets/javascripts/merge_conflict_resolver.js.es6
index 7453dbcd585..0b1b30b2c90 100644
--- a/app/assets/javascripts/merge_conflict_resolver.js.es6
+++ b/app/assets/javascripts/merge_conflict_resolver.js.es6
@@ -1,6 +1,6 @@
 //= require lib/vue
 
-window.MergeConflictResolver = class MergeConflictResolver {
+class MergeConflictResolver {
 
   constructor() {
     this.dataProvider = new MergeConflictDataProvider()