1 files changed, 0 insertions, 6 deletions
diff --git a/app/assets/javascripts/graphs/stat_graph_contributors.js b/app/assets/javascripts/graphs/stat_graph_contributors.js
index 6170a897a2f..151a4ce012c 100644
--- a/app/assets/javascripts/graphs/stat_graph_contributors.js
+++ b/app/assets/javascripts/graphs/stat_graph_contributors.js
@@ -1,16 +1,10 @@
 /* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, one-var, camelcase, one-var-declaration-per-line, quotes, no-param-reassign, quote-props, comma-dangle, prefer-template, max-len, no-return-assign, no-shadow */
 
 import _ from 'underscore';
-<<<<<<< HEAD
-=======
-import { timeFormat } from 'd3-time-format';
->>>>>>> Refactored d3 modules to instead of having a common_d3 dir, to use the micro modules instead
 import { ContributorsGraph, ContributorsAuthorGraph, ContributorsMasterGraph } from './stat_graph_contributors_graph';
 import ContributorsStatGraphUtil from './stat_graph_contributors_util';
 import { n__, s__, createDateTimeFormat, sprintf } from '../locale';
 
-const d3 = { timeFormat };
-
 export default (function() {
   function ContributorsStatGraph() {
     this.dateFormat = createDateTimeFormat({ year: 'numeric', month: 'long', day: 'numeric' });