From 12e36ee0e731e1d76acd129c50e9b8c79af99d27 Mon Sep 17 00:00:00 2001
From: Tom Scogland <scogland1@llnl.gov>
Date: Sat, 14 May 2016 16:20:45 -0700
Subject: fix merge error

---
 lib/spack/spack/modules.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib')

diff --git a/lib/spack/spack/modules.py b/lib/spack/spack/modules.py
index 9b6a019108..d2b819e80a 100644
--- a/lib/spack/spack/modules.py
+++ b/lib/spack/spack/modules.py
@@ -485,7 +485,6 @@ class TclModule(EnvModule):
     path = join_path(spack.share_path, "modules")
 
     environment_modifications_formats = {
-    formats = {
         PrependPath: 'prepend-path --delim "{delim}" {name} \"{value}\"\n',
         AppendPath: 'append-path   --delim "{delim}" {name} \"{value}\"\n',
         RemovePath: 'remove-path   --delim "{delim}" {name} \"{value}\"\n',
-- 
cgit v1.2.3-60-g2f50