Homec4science

fixed merge conflict

Authored by yifan xing <xing.yif@husky.neu.edu> on Sep 14 2017, 16:47.

Description

fixed merge conflict

Details

Committed
yifan xing <xing.yif@husky.neu.edu>Sep 14 2017, 21:05
Pushed
mickmisOct 25 2017, 14:31
Parents
R2664:f34fde88734a: used config extension
Branches
Unknown
Tags
Unknown

Event Timeline

yifan xing <xing.yif@husky.neu.edu> committed R2664:789c0a3d4344: fixed merge conflict (authored by yifan xing <xing.yif@husky.neu.edu>).Sep 14 2017, 21:05