[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

[Chris Lamb]

The following commit has been merged in the master branch:
commit 2ea1d8e208bc8978ba705fa1e7981282679518d6
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jul 29 14:08:01 2010 -0400

    Don't allow 'net' as we would have to add three extra server fields.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/live_studio/config/models.py b/live_studio/config/models.py
index b30568e..5043925 100644
--- a/live_studio/config/models.py
+++ b/live_studio/config/models.py
@@ -42,7 +42,6 @@ class Config(models.Model):
         choices=(
             ('iso',     'ISO image for a CD or DVD'),
             ('usb-hdd', 'USB / HDD image'),
-            ('net',     'Network boot image'),
         )
     )
 

-- 
live-studio