-
Philipp Riemer yazdı
* resolved some conflict from rebasing out the whitespace changes * kept the whitespace changes in lines that were changed anyway Conflicts: sw/source/core/crsr/crsrsh.cxx sw/source/core/crsr/findattr.cxx sw/source/core/crsr/findcoll.cxx sw/source/core/crsr/findtxt.cxx Change-Id: I857531b5220d7325ccc5adb9fcb9e000b4dd262a
611eb8ed