Merge branch 'master' of C:\Users\Leandro Shimanuki\PyCharmProject\SCRSM with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fenetre de commandes
Merge remote-tracking branch 'origin/master'