解决之前的冲突

ff7eaca3 · vega · e0d3d43a · ff7eaca3
Commit ff7eaca3 authored Sep 14, 2020 by vega
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

.gitignore
+0 -5

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -20,8 +20,3 @@ shopping-cart-application-service/shopping-cart-application-service.iml
 shopping-cart-application-service/target/
 order-management/order-management.iml
 order-management/target/
-<<<<<<< HEAD
-order-management/order-management.iml
-order-management/target/
-=======
->>>>>>> feature-yu.sun-20200911