| commit | 256c2c50e9065f4bceda20128858d5cff3320f48 | [log] [tgz] |
|---|---|---|
| author | Jeremy Mowery <jermowery@email.arizona.edu> | Sun Oct 18 19:43:46 2015 -0700 |
| committer | Jeremy Mowery <jermowery@email.arizona.edu> | Sun Oct 18 19:43:46 2015 -0700 |
| tree | 298f5ca71477da985b063e0d6fcc8f51a9e75140 | |
| parent | d77036f8b218b7001fb7efd27f23e9244ca76e7a [diff] |
Fixing merge conflicts
diff --git a/xos/xos/settings.py b/xos/xos/settings.py index ca0eced..bf2e1c2 100644 --- a/xos/xos/settings.py +++ b/xos/xos/settings.py
@@ -148,11 +148,8 @@ 'core', 'hpc', 'cord', -<<<<<<< HEAD 'helloworldservice', -======= 'services.onos', ->>>>>>> e4243b659f2285c47cc71779238e142b156c88c0 'ceilometer', 'requestrouter', # 'urlfilter',