Commit a3ca1212 authored by Давид Ли's avatar Давид Ли

resolve conflicts

parent c2fc7e13
hello! hello!
python-11 hello world python-11 hello world
fpdsahkpsadkhspakhpsdakhpsadhkp fpdsahkpsadkhspakhpsdakhpsadhkp
fdmgafhakshas
dev_2
hello world
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment