Skip to content

Commit 52702f0

Browse files
committed
Fix merge conflict
1 parent 40a4fd5 commit 52702f0

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

js/resources.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,16 +207,6 @@ function create_handout_tr(ho) {
207207

208208
function create_showcase_card(project) {
209209
/*
210-
<<<<<<< HEAD
211-
<tr>
212-
<td scope="row">
213-
<b>Sample Project Title</b> <br>
214-
Sample Project Authors <br>
215-
<a href="link_to_project"> [Check it Out!] </a>
216-
</td>
217-
<td> (Image, if applicable) </td>
218-
</tr>
219-
=======
220210
<div class="card" style="width: 18rem;">
221211
<div class="card-body">
222212
<h5 class="card-title">{ project.title }</h5>

0 commit comments

Comments
 (0)