commit | 15c38f98be4ec361aaaff925f78624c3fb5a42ce | [log] [tgz] |
---|---|---|
author | Serdar Unal <serdar@DESKTOP-0L078IG.localdomain> | Wed Mar 16 08:46:15 2022 +0300 |
committer | Serdar Unal <serdar@DESKTOP-0L078IG.localdomain> | Wed Mar 16 08:46:15 2022 +0300 |
tree | ce16887b1522995e072bfb4fb6bd8059332ca1aa | |
parent | 5bf6efa4fa970bc511900cac410688fd2cf26eaa [diff] | |
parent | 8677dce931c7cdb3ef757b9ce4c9df4e1b05c0b9 [diff] |
fixed conflicts