Homec4science

resolution message

Authored by ashtari on Sep 19 2019, 14:40.

Description

resolution message

Details

Committed
ashtariSep 19 2019, 14:40
Pushed
ashtariSep 19 2019, 14:41
Parents
R9316:b3b056801993: second change
R9316:1378fd8545ab: intentional conflict
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
1378fd8545abashtari
intentional conflict 
Sep 19 2019

Empty Commit

This commit is empty and does not affect any paths.