Resolved conflicts created by VSCode

widget_group_25/homepage/views.py

@@ -13,13 +13,6 @@ class HomepageView(View):
 
 def details(request,user_id):
     user = WidgetUser.objects.get(id_num=user_id)
-<<<<<<< HEAD
-    template = loader.get_template("homepage/details.html")
-    context = {
-        "user" : user,
-    }
-    return HttpResponse(template.render(context,request))
-=======
     template = loader.get_template("homepage/widgetuser_details.html")
     context = {"user" : user,}
     return HttpResponse(template.render(context,request))
@@ -41,4 +34,3 @@ class WidgetUserCreateView(CreateView):
         context["departments"] = Department.objects.all()
         return context
     
->>>>>>> dumandan/homepage

widget_group_25/widget_group_25/templates/homepage/homepage.html

@@ -12,11 +12,7 @@
     <!-- Creates an ordered list of all users-->
     <ol type = '1'>
     {% for user in user_list %}
-<<<<<<< HEAD
-        <a href = "{% url 'homepage:details' user.id_num %}">
-=======
         <a href = "{% url 'homepage:widgetuser_details' user.id_num %}">
->>>>>>> dumandan/homepage
     <li>{{user.last_name}}, {{user.first_name}} {{user.middle_name}} </br> </a> </li> </p>
 {% endfor %}
 </ol>