fixed 'conflicts' constrains
[toast/confclerk.git] / src / app /
drwxr-xr-x   ..
-rw-r--r-- 598 app.pro
-rw-r--r-- 921 main.cpp