fixed after merge issue

5af55898 · Claudio Valerio · 532f5c4c · 5af55898
Commit 5af55898 authored Nov 01, 2011 by Claudio Valerio
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

UBBoardPaletteManager.cpp src/board/UBBoardPaletteManager.cpp +0 -1

No files found.
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -68,7 +68,6 @@ UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardControll
    , mZoomPalette(0)
    , mLeftPalette(NULL)
    , mRightPalette(NULL)
-    , mDesktopRightPalette(NULL)
    , mBackgroundsPalette(0)
    , mToolsPalette(0)
    , mAddItemPalette(0)