From 4498ba27d3a737312d018123a885a833f6a6f7d0 Mon Sep 17 00:00:00 2001 From: Vyacheslav Date: Tue, 14 Nov 2023 19:30:35 +0200 Subject: [PATCH] Resolved merge conflict --- src/main/java/org/bookstore/model/ShoppingCart.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/bookstore/model/ShoppingCart.java b/src/main/java/org/bookstore/model/ShoppingCart.java index fd6e0e2..c03010c 100644 --- a/src/main/java/org/bookstore/model/ShoppingCart.java +++ b/src/main/java/org/bookstore/model/ShoppingCart.java @@ -18,7 +18,7 @@ @Entity @Data -@Table(name = "shopping_cart") +@Table(name = "shopping_carts") public class ShoppingCart { @Id @GeneratedValue(strategy = GenerationType.IDENTITY)