forgotten in previous commit
authorpavelpa <pavelpa@localhost>
Thu, 28 Jan 2010 14:59:37 +0000 (14:59 +0000)
committerpavelpa <pavelpa@localhost>
Thu, 28 Jan 2010 14:59:37 +0000 (14:59 +0000)
commit83020cddd8269fd206a9875549a5bcd1b8cf9360
tree20012d94efcdedf9c13a3cae010e8d63bb875f9c
parent872aeaa10875e45f50a9973cad7b17d9f85f83aa
forgotten in previous commit
src/gui/conflictsdialog.cpp
src/gui/conflictsdialog.h