Commit Graph

9 Commits

Author SHA1 Message Date
nikitadr
2283db3aaf Merge branch 'newbranch2' of https://git.workbench.lanit.ru/nikitadr/GitTask into newbranch2 2026-05-21 17:19:32 +04:00
nikitadr
0b7f317cad creating file.sml and secondfile.txt 2026-05-21 17:14:20 +04:00
nikitadr
e401972efc adding a line 2026-05-21 17:06:24 +04:00
nikitadr
e510930154 conflict resolution 2026-05-21 16:53:56 +04:00
nikitadr
840e7d5fe1 newbranch1 changing firstfile.xml 2026-05-21 16:34:30 +04:00
nikitadr
8f888313c1 creating file.sml and secondfile.txt 2026-05-21 16:31:49 +04:00
nikitadr
21064d6d49 main changing firstfile.xml 2026-05-21 16:26:52 +04:00
nikitadr
ebe8e24e71 creating firstfile.txt 2026-05-21 16:22:46 +04:00
nikitadr
2bb46d6f44 creating firstfile.xml 2026-05-21 16:16:24 +04:00