kebing1011
diff --git a/‎php/composer.json‎
Lines changed: 0 additions & 4 deletions b/‎php/composer.json‎
Lines changed: 0 additions & 4 deletions
@@ -7,12 +7,8 @@
  "psr-4": {
  "Algo_06\\": "06_linkedlist/",
  "Algo_07\\": "07_linkedlist/",
-<<<<<<< HEAD
- "Algo_08\\": "08_stack/"
-=======
  "Algo_08\\": "08_stack/",
  "Algo_09\\": "09_queue/"
->>>>>>> upstream/master
  }
  }
 }
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,8 @@`
`7`	`7`	`"psr-4": {`
`8`	`8`	`"Algo_06\\": "06_linkedlist/",`
`9`	`9`	`"Algo_07\\": "07_linkedlist/",`
`10`		`-<<<<<<< HEAD`
`11`		`- "Algo_08\\": "08_stack/"`
`12`		`-=======`
`13`	`10`	`"Algo_08\\": "08_stack/",`
`14`	`11`	`"Algo_09\\": "09_queue/"`
`15`		`->>>>>>> upstream/master`
`16`	`12`	`}`
`17`	`13`	`}`
`18`	`14`	`}`