fix merge conflic

Fork: 0

Perditum / percord

Browse code fix merge conflic master
commit fbc9fd0b4f2660af5ba16a5d18111501e377ac51 2 parents a49f7e6 + 651a149 MathMan05 authored on 6 Feb

Patch

Unified Split

Showing 17 changed files

Ignore Space Show notes View extra/admin-api/.idea/.idea.SpacebarAdminAPI/.idea/indexLayout.xml

Ignore Space Show notes View extra/admin-api/Models/Spacebar.Models.Db/Models/User.cs

Ignore Space Show notes View extra/admin-api/Models/Spacebar.Models.Gateway/GuildSyncResponse.cs 0 → 100644

Ignore Space Show notes View extra/admin-api/Models/Spacebar.Models.Gateway/PresenceResponse.cs 0 → 100644

Ignore Space Show notes View extra/admin-api/Models/Spacebar.Models.Gateway/Spacebar.Models.Gateway.csproj 0 → 100644

Ignore Space Show notes View extra/admin-api/Models/Spacebar.Models.Gateway/deps.json 0 → 100644

Ignore Space Show notes View extra/admin-api/Models/Spacebar.Models.Generic/Member.cs 0 → 100644

Ignore Space Show notes View extra/admin-api/Models/Spacebar.Models.Generic/Spacebar.Models.Generic.csproj 0 → 100644

Ignore Space Show notes View extra/admin-api/Models/Spacebar.Models.Generic/User.cs 0 → 100644

Ignore Space Show notes View extra/admin-api/Spacebar.GatewayOffload/Controllers/Op12Controller.cs

Ignore Space Show notes View extra/admin-api/Spacebar.GatewayOffload/Program.cs

Ignore Space Show notes View extra/admin-api/Spacebar.GatewayOffload/Spacebar.GatewayOffload.csproj

Ignore Space Show notes View extra/admin-api/Spacebar.GatewayOffload/deps.json 0 → 100644

Ignore Space Show notes View extra/admin-api/SpacebarAdminAPI.sln

Ignore Space Show notes View extra/admin-api/outputs.nix

Ignore Space Show notes View extra/admin-api/update-deps.cs

Ignore Space Show notes View src/gateway/opcodes/Identify.ts

Show line notes below