From 440ba3ddc846d94eed516ee62541ebbf2354131d Mon Sep 17 00:00:00 2001
From: dnovotny <danny@rawhide.localdomain>
Date: Wed, 16 Sep 2009 10:59:23 -0400
Subject: merge correction

---
 lib/Plugins/CCpp.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'lib/Plugins/CCpp.cpp')

diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index 76858eb..8e99beb 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -551,12 +551,10 @@ void CAnalyzerCCpp::CreateReport(const std::string& pDebugDumpDir)
 {
     update_client(_("Starting report creation..."));
 
-<<<<<<< HEAD
     std::string package;
     std::string backtrace;
     std::string UID;
-=======
->>>>>>> 5349d07f9cae8a2b9686916c1e5bd01a0fe14a29
+
     CDebugDump dd;
     dd.Open(pDebugDumpDir);
     bool bt_exists = dd.Exist(FILENAME_BACKTRACE);
@@ -565,12 +563,11 @@ void CAnalyzerCCpp::CreateReport(const std::string& pDebugDumpDir)
     {
         return; /* already done */
     }
-<<<<<<< HEAD
+
     dd.LoadText(FILENAME_PACKAGE, package);
     dd.LoadText(FILENAME_UID, UID);
     dd.Close();
-=======
->>>>>>> 5349d07f9cae8a2b9686916c1e5bd01a0fe14a29
+
 
     map_plugin_settings_t settings = GetSettings();
     if (settings["InstallDebuginfo"] == "yes" &&
-- 
cgit