Skip to content

Commit 8dc95e2

Browse files
author
Micah Torres
committed
removed float
1 parent a5fc1e0 commit 8dc95e2

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

apps/dashboard/src/app/items/items-list/items-list.component.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ <h3 mat-line>{{item.name}}</h3>
1313
</button>
1414
<p mat-line>
1515
{{item.description}}
16+
<<<<<<< Updated upstream
17+
=======
18+
</p>
19+
<p>
20+
{{item.price | currency}}
21+
>>>>>>> Stashed changes
1622
</p>
1723
</mat-list-item>
1824
</mat-list>

apps/dashboard/src/app/widgets/widgets-list/widgets-list.component.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ <h3 mat-line>{{widget.name}}</h3>
1414
<p mat-line>
1515
{{widget.description}}
1616
</p>
17+
<<<<<<< Updated upstream
18+
=======
19+
<p>
20+
{{widget.price | currency}}
21+
</p>
22+
>>>>>>> Stashed changes
1723
</mat-list-item>
1824
</mat-list>
1925
</mat-card-content>

0 commit comments

Comments
 (0)