project inspected
Merge remote-tracking branch 'origin/snapshot' into snapshot
Merge remote-tracking branch 'origin/snapshot' into snapshot
Merge remote-tracking branch 'origin/snapshot' into snapshot

Conflicts:
	src/main/java/com/spring/persistence/domain/Customer.java
	src/main/java/com/spring/persistence/domain/Order.java
	src/main/java/com/spring/persistence/domain/OrderProduct.java
	src/main/java/com/spring/persistence/domain/OrderStatus.java
	src/main/java/com/spring/persistence/domain/Payment.java
Merge remote-tracking branch 'origin/snapshot' into snapshot
Merge remote-tracking branch 'origin/snapshot' into snapshot
Merge remote-tracking branch 'origin/snapshot' into snapshot
Merge remote-tracking branch 'origin/snapshot' into snapshot
Merge remote-tracking branch 'origin/snapshot' into snapshot
Merge remote-tracking branch 'origin/snapshot' into snapshot

Conflicts:
	src/main/java/com/spring/persistence/domain/Customer.java
	src/main/java/com/spring/persistence/domain/Order.java
	src/main/java/com/spring/persistence/domain/OrderProduct.java
	src/main/java/com/spring/persistence/domain/OrderStatus.java
	src/main/java/com/spring/persistence/domain/Payment.java
Merge remote-tracking branch 'origin/snapshot' into snapshot

Conflicts:
	src/main/java/com/spring/persistence/domain/Customer.java
	src/main/java/com/spring/persistence/domain/Order.java
	src/main/java/com/spring/persistence/domain/OrderProduct.java
	src/main/java/com/spring/persistence/domain/OrderStatus.java
	src/main/java/com/spring/persistence/domain/Payment.java