# Conflicts: # csharp/App/Backend/Database/User.cs # csharp/App/Backend/Model/User.cs |
||
|---|---|---|
| .. | ||
| Relations | ||
| Folder.cs | ||
| Installation.cs | ||
| TreeNode.Equality.cs | ||
| TreeNode.cs | ||
| User.cs | ||
# Conflicts: # csharp/App/Backend/Database/User.cs # csharp/App/Backend/Model/User.cs |
||
|---|---|---|
| .. | ||
| Relations | ||
| Folder.cs | ||
| Installation.cs | ||
| TreeNode.Equality.cs | ||
| TreeNode.cs | ||
| User.cs | ||