From 73644c3acd315b8e194be7fa068cdab0e94ca340 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 30 Apr 2001 11:29:30 -0400
Subject: [PATCH] ERR: Removed a conflict that was checked in.

---
 Source/cmMakefile.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index e4a714931..74565443d 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -241,16 +241,7 @@ public:
     {
     return m_cmHomeDirectory.c_str();
     }
-<<<<<<< cmMakefile.h
-  void SetHomeOutputDirectory(const char* lib)
-    {
-    m_HomeOutputDirectory = lib;
-    cmSystemTools::ConvertToUnixSlashes(m_HomeOutputDirectory);
-    this->AddDefinition("CMAKE_BINARY_DIR", this->GetHomeOutputDirectory());
-    }
-=======
   void SetHomeOutputDirectory(const char* lib);
->>>>>>> 1.31
   const char* GetHomeOutputDirectory() const
     {
     return m_HomeOutputDirectory.c_str();