Skip to content
Commit 2d2a1099 authored by Kevin Ottens's avatar Kevin Ottens Committed by Christian Mollekopf
Browse files

Make it build 

Conflicts:
	akonadi/resourcebase.cpp
parent c1a65d95
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment