diff --git a/src/main/resources/templates/my-profile.html b/src/main/resources/templates/my-profile.html index 4a616c9..9889797 100644 --- a/src/main/resources/templates/my-profile.html +++ b/src/main/resources/templates/my-profile.html @@ -56,7 +56,7 @@
Recipe Image
-

Cost

+ Edit diff --git a/src/main/resources/templates/public-profile.html b/src/main/resources/templates/public-profile.html index de66bef..b7dae4a 100644 --- a/src/main/resources/templates/public-profile.html +++ b/src/main/resources/templates/public-profile.html @@ -56,7 +56,11 @@
Recipe Image
+<<<<<<< HEAD

Cost

+======= + +>>>>>>> 231b1ed3607b784edde28c9424f1d2bd8d350d6d