OSDN Git Service

solving merge conflicts git cannot handle
authorIvailo Monev <xakepa10@gmail.com>
Thu, 19 May 2022 16:05:12 +0000 (19:05 +0300)
committerIvailo Monev <xakepa10@gmail.com>
Thu, 19 May 2022 16:05:44 +0000 (19:05 +0300)
commitebe12db8449a297441446eee45227637f4b57703
treec9647343773d7738a61f21acf98b16865c41752c
parent72e9448eaac3ba9db654fecf6c676baf397c8c5c
parent40d0a4fb1b9629fdb3cadfb86ab364db96d7ff91
solving merge conflicts git cannot handle

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>