Homec4science

Fixed broken merge.

Authored by lintool <jimmylin@umd.edu> on Jun 17 2014, 22:48.

Description

Fixed broken merge.

Details

Committed
lintool <jimmylin@umd.edu>Jun 17 2014, 22:48
Pushed
dportabellaOct 19 2016, 16:29
Parents
R1473:6c452cbb6b5d: Merge branch 'master' into admin
Branches
Unknown
Tags
Unknown

Event Timeline

lintool <jimmylin@umd.edu> committed R1473:10d60bd28c75: Fixed broken merge. (authored by lintool <jimmylin@umd.edu>).Jun 17 2014, 22:48