[Aptitude-svn-commit] r4362 - branches/aptitude-0.3/aptitude/src/generic/util

[Daniel Burrows]

Author: dburrows
Date: Fri Sep 30 15:57:48 2005
New Revision: 4362

Modified:
   branches/aptitude-0.3/aptitude/src/generic/util/temp.h
Log:
Remove some conflict markers that were stupidly left in a file.

Modified: branches/aptitude-0.3/aptitude/src/generic/util/temp.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/util/temp.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/util/temp.h	Fri Sep 30 15:57:48 2005
@@ -377,7 +377,7 @@
     return real_name->get_name();
   }
 
-  inline dir name::get_parent() const
+  inline std::string name::get_parent() const
   {
     if(real_name != NULL)
       return real_name->get_parent();