araujolma / SOAR

7 stars 5 forks source link

Reform #56

Closed CarlosCHMS closed 6 years ago

CarlosCHMS commented 6 years ago

Hey guys, I start to search about how to solve merge conflicts and made some modifications on the files itsme.py and teste.py on the reform branch. Sorry do not inform you before.