From c79e6a3f92938af07915c23ea1d7cbb75dac6d89 Mon Sep 17 00:00:00 2001
From: Olle Lundberg <geek@nerd.sh>
Date: Tue, 16 Oct 2012 17:02:04 +0200
Subject: Whitespace fixes.

---
 tests/test_util.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/test_util.py b/tests/test_util.py
index c97c1d58..e6f417d4 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -205,6 +205,7 @@ Host *
         self.assertRaises(AssertionError,
                           lambda: paramiko.util.retry_on_signal(raises_other_exception))
 
+<<<<<<< HEAD
     def test_9_proxycommand_config_equals_parsing(self):
         """
         ProxyCommand should not split on equals signs within the value.
@@ -271,7 +272,8 @@ Host *
             paramiko.util.lookup_ssh_host_config(host, config),
             {'hostname': host, 'port': '8080'}
         )
-    def test_10_host_config_test_proxycommand(self):
+
+    def test_12_host_config_test_proxycommand(self):
         test_config_file = """
 Host proxy-with-equal-divisor-and-space
 ProxyCommand = foo=bar
-- 
cgit v1.2.3