Merge fixes.

cms-sw · Sep 6, 2015 · 108b7cd · 108b7cd
1 parent 9949cf6
commit 108b7cd
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/Fireworks/Core/src/CmsShowMain.cc b/Fireworks/Core/src/CmsShowMain.cc
@@ -349,25 +349,10 @@ CmsShowMain::CmsShowMain(int argc, char *argv[])
       m_context->getField()->setSource(FWMagField::kUser);
       m_context->getField()->setUserField(vm[kFieldCommandOpt].as<double>());
    }
-
-<<<<<<< HEAD
-   if ( m_inputFiles.empty()) {
-      f=boost::bind(&CmsShowMainBase::setupConfiguration,this);
-      startupTasks()->addTask(f);
-      f=boost::bind(&CmsShowMain::setupDataHandling,this);
-      startupTasks()->addTask(f);
-   }
-   else {
-      f=boost::bind(&CmsShowMain::setupDataHandling,this);
-      startupTasks()->addTask(f);
-      f=boost::bind(&CmsShowMainBase::setupConfiguration,this);
-      startupTasks()->addTask(f);
-   }
-=======
 
    f=boost::bind(&CmsShowMain::setupDataHandling,this);
    startupTasks()->addTask(f);
->>>>>>> 1418f5c... Autodetect configuration after setup in case config file name is not give command line and file is loaded first stime,
+
 
    if (vm.count(kLoopOpt))
       setPlayLoop();