Merged definition and initialization of conflictSeverity.
authorPhilipp Spitzer <philipp@spitzer.priv.at>
Sun, 22 Jan 2017 19:11:19 +0000 (20:11 +0100)
committerPhilipp Spitzer <philipp@spitzer.priv.at>
Sun, 22 Jan 2017 19:11:19 +0000 (20:11 +0100)
commit056bee216eedaf6b06fac36bd8491f4fc6a185d2
treecea1b67132ac31e0b08ca09df893bdba09aa90b1
parent0f10c1afc546c4d06ed99dd4a39a2ec281c45bf6
Merged definition and initialization of conflictSeverity.
src/mvc/delegate.cpp