Fix merging.
authorKlaas Freitag <freitag@owncloud.com>
Thu, 13 Dec 2012 18:52:07 +0000 (19:52 +0100)
committerKlaas Freitag <freitag@owncloud.com>
Thu, 13 Dec 2012 18:52:07 +0000 (19:52 +0100)
commitc6edde1365f5792c1e6d1013c658d56a5430ce11
treed19e093595d1d6eb45d6f4f07fbb48f7c7d05eea
parent5c918a486c2e80d2b9cc3d1db28a0c5bc82cce0c
Fix merging.
src/mirall/csyncthread.cpp