Add the conflicts flag to view queries.#255

rinverardi wants to merge 1 commit intohelun:masterhelun/Ektorp:masterfrom

rinverardi:conflicts1rinverardi/src-ektorp:conflicts1Copy head branch name to clipboard