Fix merge for develop option

0843bf86 · Cédric de Saint Martin · e076985e · 0843bf86
Commit 0843bf86 authored Aug 02, 2012 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

slapos/grid/slapgrid.py slapos/grid/slapgrid.py +0 -1

No files found.
--- 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])