From 0843bf86cb610a34a9e91a7e051f3bc221ab6e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Thu, 2 Aug 2012 15:31:25 +0200
Subject: [PATCH] Fix merge for develop option

---
 slapos/grid/slapgrid.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/slapos/grid/slapgrid.py b/slapos/grid/slapgrid.py
index 6d3a02023..2468a6a01 100644
--- a/slapos/grid/slapgrid.py
+++ b/slapos/grid/slapgrid.py
@@ -278,7 +278,6 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
             develop=option_dict.get('develop', False),
             software_release_filter_list=option_dict.get('only_sr', None),
             computer_partition_filter_list=option_dict.get('only_cp', None),
-            develop=option_dict.get('develop', False)
             ),
           option_dict])
 
-- 
2.30.9