p

inventory/migrations/0055_merge_0054_alter_staff_staff_type_0054_dealersmake.py

@@ -0,0 +1,14 @@
+# Generated by Django 4.2.17 on 2025-03-04 21:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0054_alter_staff_staff_type'),
+        ('inventory', '0054_dealersmake'),
+    ]
+
+    operations = [
+    ]

templates/header.html

@@ -71,7 +71,6 @@
             <div class="parent-wrapper label-1">
               <ul class="nav collapse parent" data-bs-parent="#navbarVerticalCollapse" id="nv-inventory">
                 <li class="collapsed-nav-item-title d-none">{% trans "Inventory"|capfirst %}</li>
-<<<<<<< HEAD
                 {% if perms.invenotry.add_car %}
                   <li class="nav-item">
                     <a class="nav-link" href="{% url 'car_add' %}">
@@ -83,17 +82,7 @@
                   </li>
                 {% endif %}
                 <!--<li class="nav-item">
-=======
+
-                <li class="nav-item">
-                  <a class="nav-link" href="{% url 'car_add' %}">
-                    <div class="d-flex align-items-center">
-                      <span class="nav-link-icon"><span class="fas fa-plus-circle"></span></span><span class="nav-link-text">{% trans "add car"|capfirst %}</span>
-                    </div>
-                  </a>
-                  <!-- more inner pages-->
-                </li>
-                <li class="nav-item">
->>>>>>> 31fa1b8011982df2a7a87369e33df01fae22e69d
                   <a class="nav-link" href="{% url 'inventory_stats' %}">
                     <div class="d-flex align-items-center">
                       <span class="nav-link-icon"><span class="fas fa-car-side"></span></span><span class="nav-link-text">{% trans 'Cars'|capfirst %}</span>
@@ -223,12 +212,7 @@
                       <span class="nav-link-icon"><span class="fas fa-users-cog"></span></span><span class="nav-link-text">{% trans "Representatives"|capfirst %}</span>
                     </div>
                   </a>
-<<<<<<< HEAD
                   </li>
-=======
-                   more inner pages-->
-                {% comment %} </li>
->>>>>>> 31fa1b8011982df2a7a87369e33df01fae22e69d
                   <li class="nav-item">
                   <a class="nav-link" href="{% url 'opportunity_list' %}">
                     <div class="d-flex align-items-center">