solved github problem and working on another pc
my UML
final
final
solved conflicts
new line
useless
conflicts
conflicts
solving
solvingg
conflicts
nothing
Merge branch 'master' of https://github.com/ndomar/megasoft-13 into c3s1_sendnotifications
cleaned, conflicts
removed chrome
nothing
a
cleaned every single file
schema