Homec4science

Fixed merge conflict that got committed to master accidentally.

Authored by lintool <jimmylin@umd.edu> on Jun 9 2015, 20:10.

Description

Fixed merge conflict that got committed to master accidentally.

Details

Committed
lintool <jimmylin@umd.edu>Jun 9 2015, 20:10
Pushed
dportabellaOct 19 2016, 16:29
Parents
R1473:86d5ec617e52: Fixed issues #119, #122, #130, #131
Branches
Unknown
Tags
Unknown

Event Timeline

lintool <jimmylin@umd.edu> committed R1473:988a2354d84d: Fixed merge conflict that got committed to master accidentally. (authored by lintool <jimmylin@umd.edu>).Jun 9 2015, 20:10