From d568538177ff3254708e44f35fb7647bcb2fcdf0 Mon Sep 17 00:00:00 2001
From: kaipher7 <kai.hahnhansen@student.nmt.edu>
Date: Wed, 22 Apr 2026 00:03:06 -0600
Subject: [PATCH] updated cost after pulling changes

---
 src/main/resources/templates/my-profile.html     | 2 +-
 src/main/resources/templates/public-profile.html | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/resources/templates/my-profile.html b/src/main/resources/templates/my-profile.html
index 9889797..c4ead38 100644
--- a/src/main/resources/templates/my-profile.html
+++ b/src/main/resources/templates/my-profile.html
@@ -56,7 +56,7 @@
 					<div th:if="${recipe.images != null and !#lists.isEmpty(recipe.images)}">
     					<img th:src="${recipe.images[0].imageUrl}" alt="Recipe Image" style="max-width: 200px;">
 					</div>
-                	<span th:text="${recipe.cost != null ? #strings.repeat('$', recipe.cost) : ''}"></span>
+                	<p class="card-cost" th:text="${recipe.cost}">Cost</p>
             	</div>
         	</a>
         	<a th:href="@{/recipes/{id}/edit(id=${recipe.id})}" class="edit-link">Edit</a>
diff --git a/src/main/resources/templates/public-profile.html b/src/main/resources/templates/public-profile.html
index b7dae4a..de66bef 100644
--- a/src/main/resources/templates/public-profile.html
+++ b/src/main/resources/templates/public-profile.html
@@ -56,11 +56,7 @@
                             <div th:if="${recipe.images != null and !#lists.isEmpty(recipe.images)}">
                                 <img th:src="${recipe.images[0].imageUrl}" alt="Recipe Image" style="max-width: 200px;">
                             </div>
-<<<<<<< HEAD
                             <p class="card-cost" th:text="${recipe.cost}">Cost</p>
-=======
-                            <span th:text="${recipe.cost != null ? #strings.repeat('$', recipe.cost) : ''}"></span>
->>>>>>> 231b1ed3607b784edde28c9424f1d2bd8d350d6d
                         </div>
                     </a>
                 </div>