Fixing merge
author Daniel Nicoletti
()
committer Daniel Nicoletti
()
commit 841c61992e1284371f59f8dc0cbcf975d8ddd5fa
tree 8429f8ba5370e070b906f72574821e817c836543
parent edf62558a5442307fc5d7dd45c4f56fbe5707834
Fixing merge
printer-manager-kcm/PrinterDescription.cpp
printer-manager-kcm/PrinterDescription.ui