Resolved merge conflicts

2164ca44 · Ben Anderson · 903c7818 · 3f3e032a · 2164ca44
Commit 2164ca44 authored May 11, 2021 by Ben Anderson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

PromotionsController.java ...um/ascend/promotions/controller/PromotionsController.java +1 -1

No files found.
--- a/src/main/java/com/nisum/ascend/promotions/controller/PromotionsController.java
+++ b/src/main/java/com/nisum/ascend/promotions/controller/PromotionsController.java
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

-@CrossOrigin("*")
+@CrossOrigin(origins = "*")
 @RestController
 @RequestMapping("/api/promos")
 public class PromotionsController {