conflict fix

templates/module_auth/user_view.html

@@ -401,6 +401,7 @@ var mealUrl = "{% url 'module_activity:meal_detail' pk=0 %}"
 var medicationUrl = "{% url 'module_activity:medication_detail' pk=0 %}"
 var bowelUrl = "{% url 'module_activity:bowel_detail' pk=0 %}"
 var symptomUrl = "{% url 'module_activity:meal_symptom_detail' pk=0 %}"
+
 var reportUrl = "{% url 'module_activity:report_data' principal_id=obj.id %}?date_range=date_range_data"
 
 // Entry point
@@ -538,7 +539,6 @@ function filterActivityData(dateRange){
 }
 */
 
-
 function getReportData(days){
     console.log("data range is ", days)
     var url = days ? reportUrl.replace("date_range_data", days) : reportUrl

templates/module_support/feedback.html

@@ -68,6 +68,7 @@
         </div>
 
  <!-- modal for View Feedback Question Answer  -->
+
 <div class="modal fade" id="feedbackmodal" tabindex="-1" role="dialog" aria-labelledby="feedbackmodalLabel" aria-hidden="true">
     <div class="modal-dialog modal-dialog-scrollable" role="document">
       <div class="modal-content" >
@@ -127,8 +128,6 @@ function initializeDataTable(tableName, mainUrl) {
                 data: "comment",
                 render: function (data, type, row) {
                     return `<button class="btn btn-primary view-comment" data-comment="${data}">View</button>`;
-                    
-                }
             }
         ],
         debug: true,