fix: conflits

cesium · Sep 23, 2024 · f1800bc · f1800bc
1 parent 23558c6
commit f1800bc
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/lib/atomic_web/live/announcement_live/form_component.html.heex b/lib/atomic_web/live/announcement_live/form_component.html.heex
@@ -7,8 +7,6 @@
 
           <.field field={f[:description]} type="textarea" placeholder="Write a description" required class="w-full overflow-auto resize-none h-44 xl:h-64" />
         </div>
-
-<<<<<<< jc/improve-announcements
         <div class="space-y-4">
           <.live_component module={ImageUploader} id="uploader" uploads={@uploads} target={@myself} class="object-cover" />
 
@@ -17,10 +15,6 @@
           </div>
         </div>
       </div>
-=======
-    <div class="mt-8 flex w-full justify-end">
-      <.button size={:md} color={:white} icon="hero-cube" type="submit"><%= gettext("Save Changes") %></.button>
->>>>>>> develop
     </div>
   </.form>
 </div>