Imbus/TTime
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Old unresolved merge conflict fixed

Browse source
This commit is contained in:
Imbus 2024-03-18 23:39:02 +01:00
parent 0fa7558d64
commit 4c297ab2ef
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
testing.py
View file

@ -22,13 +22,10 @@ loginPath = base_url + "/api/login"
addProjectPath = base_url + "/api/project" addProjectPath = base_url + "/api/project"
submitReportPath = base_url + "/api/submitReport" submitReportPath = base_url + "/api/submitReport"
getWeeklyReportPath = base_url + "/api/getWeeklyReport" getWeeklyReportPath = base_url + "/api/getWeeklyReport"
<<<<<<< HEAD
getProjectPath = base_url + "/api/project" getProjectPath = base_url + "/api/project"
=======
signReportPath = base_url + "/api/signReport" signReportPath = base_url + "/api/signReport"
addUserToProjectPath = base_url + "/api/addUserToProject" addUserToProjectPath = base_url + "/api/addUserToProject"
promoteToAdminPath = base_url + "/api/promoteToAdmin" promoteToAdminPath = base_url + "/api/promoteToAdmin"
>>>>>>> 9ad89d60636ac6091d71b0bf307982becc9b89fe
# Posts the username and password to the register endpoint # Posts the username and password to the register endpoint
@ -232,9 +229,6 @@ if __name__ == "__main__":
test_add_project() test_add_project()
test_submit_report() test_submit_report()
test_get_weekly_report() test_get_weekly_report()
<<<<<<< HEAD
test_get_project() test_get_project()
=======
test_sign_report() test_sign_report()
test_add_user_to_project() test_add_user_to_project()
>>>>>>> 9ad89d60636ac6091d71b0bf307982becc9b89fe