Home Explore Help
Sign In
bux
/
tracim_v2
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

merge conflicts

Skylsmoi 6 years ago
parent
75dfe88d74 a918d74edc
commit
4fa73d63fc
2 changed files with 1 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      backend/pytest.ini
  2. 0 1
      frontend/src/css/Login.styl

+ 1 - 1
backend/pytest.ini View File

1 
 [pytest]
 1 
 [pytest]
2 
 minversion = 2.8
 2 
 minversion = 2.8
3 
-testpaths = tracim
3 
+testpaths = tracim_backend
4 
 addopts = -s -v
 4 
 addopts = -s -v

+ 0 - 1
frontend/src/css/Login.styl View File

45 
         padding-left 45px
 45 
         padding-left 45px
46 
     &__btnsubmit
 46 
     &__btnsubmit
47 
       display block
 47 
       display block
48 
-      margin 0 auto
49 
       border none
 48 
       border none
50 
       width 150px
 49 
       width 150px
51 
       background-color green
 50 
       background-color green