[Aptitude-svn-commit] r4361 -
branches/aptitude-0.3/aptitude/src/generic/util
Daniel Burrows
dburrows at costa.debian.org
Fri Sep 30 15:57:27 UTC 2005
Author: dburrows
Date: Fri Sep 30 15:57:26 2005
New Revision: 4361
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:26 2005
@@ -266,17 +266,10 @@
bool valid() const;
std::string get_name() const;
-<<<<<<< .mine
- /** \return the enclosing directory of this temporary name; will
- * never be an invalid reference unless this is invalid.
- */
- dir get_parent() const;
-=======
/** \return the enclosing directory of this temporary name; will
* never be an invalid reference unless this is invalid.
*/
std::string get_parent() const;
->>>>>>> .r4354
};
class name::impl
More information about the Aptitude-svn-commit
mailing list