Skip to content

Commit

Permalink
Resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
viacheslav-torbin committed Nov 18, 2023
1 parent 1563128 commit 4498ba2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/java/org/bookstore/model/ShoppingCart.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

@Entity
@Data
@Table(name = "shopping_cart")
@Table(name = "shopping_carts")
public class ShoppingCart {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand Down

0 comments on commit 4498ba2

Please sign in to comment.