# Conflicts: # csharp/App/Backend/DataTypes/Methods/User.cs # csharp/App/Backend/Database/Db.cs |
||
|---|---|---|
| csharp | ||
| doc | ||
| firmware | ||
| frontend | ||
| make_deploy | ||
| python | ||
| typescript | ||
| .gitignore | ||
# Conflicts: # csharp/App/Backend/DataTypes/Methods/User.cs # csharp/App/Backend/Database/Db.cs |
||
|---|---|---|
| csharp | ||
| doc | ||
| firmware | ||
| frontend | ||
| make_deploy | ||
| python | ||
| typescript | ||
| .gitignore | ||