Fixed merge error
authorDan Breslau <dbreslau@painless-security.com>
Tue, 5 Apr 2016 02:31:35 +0000 (22:31 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Tue, 5 Apr 2016 02:31:35 +0000 (22:31 -0400)
commitcc43748edef21f411662c355518120d0b0677567
treec92815ed1400f506791483140c6272137ab5d532
parent47af2e6683d93e3ac0425407db4e1793bad168a2
Fixed merge error
src/moonshot-identity-management-view.vala