From 320e5a325286d342efca45bf0206af8bbef2d49d Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Mon, 29 Aug 2011 23:55:37 +0000
Subject: [PATCH] Fix oopsies leftover from the playlist model rename

---
 src/libtomahawk/CMakeLists.txt             | 4 ----
 src/libtomahawk/widgets/whatshotwidget.cpp | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 25cbf469f..bd09f66c0 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -368,13 +368,9 @@ set( libHeaders
     widgets/SeekSlider.h
     widgets/playlisttypeselectordlg.h
     widgets/welcomewidget.h
-<<<<<<< HEAD
     widgets/whatshotwidget.h
-    widgets/welcomeplaylistmodel.h
-=======
     widgets/RecentlyPlayedPlaylistsModel.h
     widgets/RecentPlaylistsModel.h
->>>>>>> master
     widgets/overlaywidget.h
     widgets/HeaderLabel.h
     widgets/HeaderWidget.h
diff --git a/src/libtomahawk/widgets/whatshotwidget.cpp b/src/libtomahawk/widgets/whatshotwidget.cpp
index b68649619..894e8246f 100644
--- a/src/libtomahawk/widgets/whatshotwidget.cpp
+++ b/src/libtomahawk/widgets/whatshotwidget.cpp
@@ -24,7 +24,7 @@
 #include "viewmanager.h"
 #include "sourcelist.h"
 #include "tomahawksettings.h"
-#include "welcomeplaylistmodel.h"
+#include "RecentPlaylistsModel.h"
 
 #include "audio/audioengine.h"
 #include "playlist/playlistmodel.h"