# Conflicts: # csharp/App/Backend/DataTypes/Methods/User.cs # csharp/App/Backend/Database/Db.cs |
||
|---|---|---|
| .. | ||
| FolderAccess.cs | ||
| InstallationAccess.cs | ||
| Relation.cs | ||
| Session.cs | ||
# Conflicts: # csharp/App/Backend/DataTypes/Methods/User.cs # csharp/App/Backend/Database/Db.cs |
||
|---|---|---|
| .. | ||
| FolderAccess.cs | ||
| InstallationAccess.cs | ||
| Relation.cs | ||
| Session.cs | ||