Fixing merge conflict and broken test

This commit is contained in:
Chris Troutner
2025-08-21 08:45:18 -07:00
15 changed files with 269 additions and 15 deletions
+3 -3
View File
@@ -1,8 +1,8 @@
{
"email": "system@system.com",
"name": "admin",
"password": "O52nYamPmP7zE9Jfwgxo",
"password": "McHlnXLpayjhShkPjIGx",
"type": "admin",
"id": "684246cf4e94f2261caf9848",
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY4NDI0NmNmNGU5NGYyMjYxY2FmOTg0OCIsImlhdCI6MTc0OTE3NDAyMX0.9GAS6q_xFz5Bwi7RwIqrqM3Q48DFlz_A-S0_r_L2pTQ"
"id": "68a73ee8bc7d1e022691048a",
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY4YTczZWU4YmM3ZDFlMDIyNjkxMDQ4YSIsImlhdCI6MTc1NTc5MTA4MH0.ahqw8ywrhtQ8Sz9QY42AZ267hOd0n2Y_gzZCbv91N8I"
}