From b61d554dc818c2514384b017c74dfa61c04a8c3a Mon Sep 17 00:00:00 2001
From: Mario Melara <maamelara@gmail.com>
Date: Wed, 4 Nov 2015 13:28:12 -0800
Subject: Fixed architecture.py file so it doesn't have the weird merge changes
 i.e <<<HEAD etc. Also added target method of recognizing it's own
 architecture

---
 lib/spack/spack/architecture.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'lib')
diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py
index f56e4a3fbb..64416e8b4c 100644
--- a/lib/spack/spack/architecture.py
+++ b/lib/spack/spack/architecture.py
@@ -86,20 +86,14 @@ class Architecture(object):
         self.name = name
 
     def add_target(self, name, target):
-<<<<<<< HEAD
-        target.set_architecture(self)
-        self.targets[name] = target          
-    
-=======
         """Used by the architecture specific subclass to list available targets. Raises an error
         if the architecture specifies a name that is reserved by spack as an alias.
         """
         if name in ['front_end', 'fe', 'back_end', 'be', 'default']:
             raise ValueError("%s is a spack reserved alias and cannot be the name of a target" % name)
+        target.set_architecture(self)
         self.targets[name] = target
 
-
->>>>>>> 8b3f2ec1d117e1a8b206927f51db8684396c231b
     def target(self, name):
         """This is a getter method for the target dictionary that handles defaulting based
         on the values provided by default, front-end, and back-end. This can be overwritten
-- 
cgit v1.2.3-70-g09d2

