delete duplicate validate() method

probably a merge conflict.

Change-Id: Ibe8941ab471943b7385ceb4b4d4559719a7092b6
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/heat/engine/resources.py b/heat/engine/resources.py
index 77453e23b4050ada90190a3584731b44cb83eeaa..8be4182aa6d1d55ec8413cbde57944c398f91e6e 100644 (file)
--- a/heat/engine/resources.py
+++ b/heat/engine/resources.py
@@ -288,9 +288,6 @@ class Resource(object):
                 self.state_set(self.UPDATE_COMPLETE)
             return result
 
-    def validate(self):
-        logger.info('Validating %s' % str(self))
-
     def validate(self):
         logger.info('Validating %s' % str(self))