Browse Source
merge conflicts
Skylsmoi
2 changed files with 1 additions and 2 deletions
+ 1
- 1
backend/pytest.ini
View File
|
||
| 1 | 1 |
|
| 2 | 2 |
|
| 3 |
|
|
| 3 |
|
|
| 4 | 4 |
|
+ 0
- 1
frontend/src/css/Login.styl
View File
|
||
| 45 | 45 |
|
| 46 | 46 |
|
| 47 | 47 |
|
| 48 |
|
|
| 49 | 48 |
|
| 50 | 49 |
|
| 51 | 50 |
|