Resolve conflict in app/assets/javascripts/graphs/stat_graph_contributors.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/graphs/stat_graph_contributors.js

 /* 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';
->>>>>>> origin/master
 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' });
@@ -105,7 +99,6 @@ export default (function() {
   };
 
   ContributorsStatGraph.prototype.change_date_header = function() {
-<<<<<<< HEAD
     const x_domain = ContributorsGraph.prototype.x_domain;
     const formattedDateRange = sprintf(
       s__('ContributorsPage|%{startDate} – %{endDate}'),
@@ -115,13 +108,6 @@ export default (function() {
       },
     );
     return $('#date_header').text(formattedDateRange);
-=======
-    var print, print_date_format, x_domain;
-    x_domain = ContributorsGraph.prototype.x_domain;
-    print_date_format = d3.timeFormat("%B %e %Y");
-    print = print_date_format(x_domain[0]) + " - " + print_date_format(x_domain[1]);
-    return $("#date_header").text(print);
->>>>>>> origin/master
   };
 
   ContributorsStatGraph.prototype.redraw_author_commit_info = function(author) {