SoDOff-Project/sodoff
1
0
Fork 1
mirror of https://github.com/SoDOff-Project/sodoff.git synced 2025-10-11 08:18:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix Remaining Merge Conflict

Browse Source
This commit is contained in:
Alan Moon 2025-02-09 15:51:27 -08:00
parent 23cd97b4b2
commit 329046b498
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Model/DBContext.cs
View File

@ -25,13 +25,10 @@ public class DBContext : DbContext {
public DbSet<Party> Parties { get; set; } = null!; public DbSet<Party> Parties { get; set; } = null!;
public DbSet<Neighborhood> Neighborhoods { get; set; } = null!; public DbSet<Neighborhood> Neighborhoods { get; set; } = null!;
// we had a brief debate on whether it's neighborhoods or neighborheed // we had a brief debate on whether it's neighborhoods or neighborheed
<<<<<<< HEAD
public DbSet<UserBan> UserBans { get; set; } = null!; public DbSet<UserBan> UserBans { get; set; } = null!;
=======
public DbSet<Group> Groups { get; set; } = null!; public DbSet<Group> Groups { get; set; } = null!;
public DbSet<Rating> Ratings { get; set; } = null!; public DbSet<Rating> Ratings { get; set; } = null!;
public DbSet<RatingRank> RatingRanks { get; set; } = null!; public DbSet<RatingRank> RatingRanks { get; set; } = null!;
>>>>>>> 13df822608c41690c6744ae8c594368ae1f684b5
private readonly IOptions<ApiServerConfig> config; private readonly IOptions<ApiServerConfig> config;