Fixed conflicts

packages/jest-cli/src/reporters/default_reporter.js

@@ -15,32 +15,13 @@ import type {GlobalConfig, Path, ProjectConfig} from 'types/Config';
 import type {Test} from 'types/TestRunner';
 import type {ReporterOnStartOptions} from 'types/Reporters';
 
-<<<<<<< HEAD:packages/jest-cli/src/reporters/default_reporter.js
 import {clearLine, getConsoleOutput} from 'jest-util';
 import chalk from 'chalk';
 import isCI from 'is-ci';
 import BaseReporter from './base_reporter';
 import Status from './Status';
 import getResultHeader from './get_result_header';
-<<<<<<< HEAD
-=======
-const {clearLine} = require('jest-util');
-const chalk = require('chalk');
-const isCI = require('is-ci');
-
-const BaseReporter = require('./BaseReporter');
-const Status = require('./Status');
-const getConsoleOutput = require('./getConsoleOutput');
-const getResultHeader = require('./getResultHeader');
-<<<<<<< HEAD:packages/jest-cli/src/reporters/default_reporter.js
-const {pluralize} = require('./utils');
->>>>>>> Improved the jest reporter with snapshot info per test.:packages/jest-cli/src/reporters/DefaultReporter.js
-=======
-const getSnapshotStatus = require('./getSnapshotStatus');
->>>>>>> Refactored the code and wrote some tests for the snapshot test:packages/jest-cli/src/reporters/DefaultReporter.js
-=======
 import getSnapshotStatus from './get_snapshot_status';
->>>>>>> Updated default_reporter test with snapshots and updated files names for consistency.
 
 type write = (chunk: string, enc?: any, cb?: () => void) => boolean;
 type FlushBufferedOutput = () => void;