|
|
@@ -56,7 +56,12 @@
|
|
|
</div>
|
|
|
<div class="container activity_details">
|
|
|
<div class="activity_details_img">
|
|
|
+<<<<<<< HEAD
|
|
|
<img th:src="${portalHost +'/img/activity_details_img.png'}">
|
|
|
+=======
|
|
|
+ <img
|
|
|
+ th:src="${portalHost +'/img/activity_details_img.jpg'}">
|
|
|
+>>>>>>> 44881295eebc923e2703e39d4ce365e48330edba
|
|
|
</div>
|
|
|
<div class="activity_details_content">
|
|
|
<ul>
|