# Conflicts:
#   src/test/java/com/nisum/ascend/promotions/controller/PromotionsControllerTest.java

edit promo is completed

See merge request !9

# Conflicts:
#   src/main/java/com/nisum/ascend/promotions/repository/PromotionRepository.java
#   src/test/java/com/nisum/ascend/promotions/controller/PromotionsControllerTest.java

AFP-60

See merge request !7

Afp 59

See merge request !4

# Conflicts:
#   src/main/java/com/nisum/ascend/promotions/controller/PromotionsController.java
#   src/main/java/com/nisum/ascend/promotions/exception/RestWebExceptionHandler.java
#   src/test/java/com/nisum/ascend/promotions/controller/PromotionsControllerTest.java

# Conflicts:
#	src/test/java/com/nisum/ascend/promotions/controller/PromotionsControllerTest.java

Implements getting promotions by product SKU + tests

See merge request !3

Gets all promotions + tested

See merge request !1

Tests getAllPromos

See merge request !2

# Conflicts:
#   src/main/java/com/nisum/ascend/promotions/controller/PromotionsController.java