Update 500 error page to include Applications and Resources kb link

myuw-root-webapp/src/main/webapp/500.html

@@ -83,7 +83,11 @@
                   <li role="menuitem"><a href="https://madison.sis.wisc.edu/psp/sissso/EMPLOYEE/SA/c/SA_LEARNING_MANAGEMENT.SS_FACULTY.GBL">Faculty Center</a></li>
                   <li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/EOAWMA_MAIN_FL.EOAWMA_MAIN_FL.GBL">Human Resources Approvals</a></li>
                   <li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=TimeAbsenceDashboard">Manager Time and Absence Dashboard</a></li>
+<<<<<<< HEAD
                   <li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID:PTPPNAVCOL&scname=HC_SELF_SERVICE_PAYROLL&PTPPB_GROUPLET_ID=PAYROLL&CRefName=HC_PY_SS_NAVCOLL_FL">Payroll Information (earnings, tax statements, W4, direct deposit, etc.)</a></li>
+=======
+                  <li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psc/hrs-fd/EMPLOYEE/HRMS/c/NUI_FRAMEWORK.PT_AGSTARTPAGE_NUI.GBL?CONTEXTIDPARAMS=TEMPLATE_ID:PTPPNAVCOL&scname=HC_SELF_SERVICE_PAYROLL&PTPPB_GROUPLET_ID=PAYROLL&ptgpid=ADMN_S202001071517395625097148">Payroll Information (earnings, tax statements, W4, direct deposit, etc.)</a></li>
+>>>>>>> f1800d5 (Update 500 error page to include Applications and Resources kb link)
                   <li role="menuitem"><a href="http://performance-managment-development-program">Performance Management (PMPD)</a></li>
                   <li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=PersonalInformation">Personal Information</a></li>
                   <li role="menuitem"><a href="https://www.hrs.wisconsin.edu/psp/hrs-fd/EMPLOYEE/HRMS/c/UW_PT_RDR.UW_PT_RDR.GBL?G=RequestAbsence">Request absence</a></li>