On 05/05/2016 04:29, Albert Astals Cid wrote: > Text conflict in tests/plugins/CMakeLists.txt > 1 conflicts encountered. Fixed, thanks.
« Back to merge proposal
On 05/05/2016 04:29, Albert Astals Cid wrote: CMakeLists. txt
> Text conflict in tests/plugins/
> 1 conflicts encountered.
Fixed, thanks.