Remove Git conflict markers (#2873)

dguo · bestander · commit 7466829cc509 · 2017-03-10T11:50:45.000Z
diff --git a/src/cli/commands/install.js b/src/cli/commands/install.js
@@ -550,8 +550,6 @@ export class Install {
   }
 
   /**
-<<<<<<< HEAD
-=======
    * Check if the loaded lockfile has all the included patterns
    */
 

Original file line number	Diff line number	Diff line change
`@@ -550,8 +550,6 @@ export class Install {`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`/**`
`553`		`-<<<<<<< HEAD`
`554`		`-=======`
`555`	`553`	`* Check if the loaded lockfile has all the included patterns`
`556`	`554`	`*/`
`557`	`555`