diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-11-23 15:05:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-11-23 15:05:47 -0600 |
| commit | 95063f60a5f724feaeb50d5b8d297f98a5973c8b (patch) | |
| tree | 850390e1b9a2939a4a17daf26a55067f0e48f2ea /tdenetworkmanager/src | |
| parent | b6de2f2ddd60f886970cfb2054ab9c646879fa85 (diff) | |
| download | tdenetworkmanager-95063f60a5f724feaeb50d5b8d297f98a5973c8b.tar.gz tdenetworkmanager-95063f60a5f724feaeb50d5b8d297f98a5973c8b.zip | |
Fix another FTBFS
Diffstat (limited to 'tdenetworkmanager/src')
| -rw-r--r-- | tdenetworkmanager/src/tdenetman-pluginmanager.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp index 7a6cace..0dad6ad 100644 --- a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp +++ b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp @@ -122,11 +122,7 @@ Plugin* PluginManager::loadPlugin(const TQString& pluginID) // try to load Plugin int error = 0; KPluginInfo* info = infoForPluginID(pluginID); -<<<<<<< HEAD:tdenetworkmanager/src/knetworkmanager-pluginmanager.cpp - Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "KNetworkManager/Plugin" ), -======= Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "TDENetworkManager/Plugin" ), ->>>>>>> 75d5225a52e81e369e4bcef45bee258724573688:tdenetworkmanager/src/tdenetman-pluginmanager.cpp TQString::fromLatin1( "[X-TDE-PluginInfo-Name]=='%1'" ).arg( pluginID ), this, 0, TQStringList(), &error ); // plugin loaded? |