remove error format in camera

khengyun · Oct 23, 2023 · e907e25 · e907e25
1 parent 6983137
commit e907e25
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/main/webapp/WEB-INF/jspf/guest/components/camera.jspf b/src/main/webapp/WEB-INF/jspf/guest/components/camera.jspf
@@ -1,7 +1,4 @@
-<<<<<<< Updated upstream
-=======
 <%@ page pageEncoding="UTF-8" %>
->>>>>>> Stashed changes
 <!-- Camera -->
 <div class="modal fade" tabindex="-1" id="camera-modal" aria-hidden="true">
   <div class="modal-dialog modal-dialog-scrollable modal-dialog-centered modal-xl">