diff options
| author |  rcoh <rcoh@mit.edu> | 2011-02-09 12:16:50 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-02-09 12:16:50 -0500 |
| commit | 1604f05ec0bad79798bbd764cd62bdb20e55f444 (patch) | |
| tree | 6c7206f9f2b082d8eb88cc8cfdfff3332ca8a7a2 /LightInstallation.py | |
| parent | 9cf7747d70032cee28f29f9707360544a0e63277 (diff) | |
| parent | 834cd2b0eaa27cfdba67d712d5d14120c6a441c3 (diff) | |
Merge branch 'osc'
Conflicts:
Profile.py
Diffstat (limited to 'LightInstallation.py')
| -rwxr-xr-x | LightInstallation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LightInstallation.py b/LightInstallation.py index c1f01e8..41cc925 100755 --- a/LightInstallation.py +++ b/LightInstallation.py @@ -193,7 +193,7 @@ class LightInstallation(object): def main(argv): if len(argv) == 1: - l = LightInstallation('LightInstallationConfig.xml') + l = LightInstallation('config/6thFloor.xml') else: l = LightInstallation(argv[1]) |