fix conflicts

rapidpro · Jan 11, 2024 · 922360c · 922360c
1 parent a32a56d
commit 922360c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/templates/public/ureporters.html b/templates/public/ureporters.html
@@ -146,11 +146,7 @@
                                  class="md:flex engagement-graph-block hover-parent block mt-16 p-2 bg-dark-blue"
                                  id="graph-block-{{ metric.slug }}-{{ time_filter.time_filter_number }}">
                                 <div class="md:w-2/5 hover-parent">
-<<<<<<< HEAD
                                     <div class="bg-light1-v2024 h-1 w-16 mb-4"></div>
-=======
-                                    <div class="bg-light1-home h-1 w-16 mb-4"></div>
->>>>>>> 8396dbd6 (fix conflicts)
                                     <div class="text-3xl mb-4 font-bold">{{ metric.title }}</div>
                                     <div data-page="engagement" class="text-xs flex mb-6 text-black random-pill">
                                         {% for segment in data_segments %}