Merge branch 'item_types' into rumor_columns

121569b2 · Martin Burchell · 1afec2dd · b6671470 · 121569b2 · 121569b2
Commit 121569b2 authored 9 years ago by Martin Burchell
--- a/django/website/chn_spreadsheet/migrations/0004_add_rapidpro_config.py
+++ b/django/website/chn_spreadsheet/migrations/0004_add_rapidpro_config.py
@@ -35,7 +35,6 @@ RAPIDPRO_CONFIG = {
            "name": "Rumors (Text) - DEY Say sample flow",
            "type": "text",
            "field": "body"
-
        },
        {
            "name": "Channel",

--- a/django/website/chn_spreadsheet/migrations/0006_update_rapidpro_config.py
+++ b/django/website/chn_spreadsheet/migrations/0006_update_rapidpro_config.py
@@ -35,7 +35,6 @@ RAPIDPRO_CONFIG = {
            "name": "Rumors (Text) - DEY Say sample flow",
            "type": "text",
            "field": "body"
-
        },
        {
            "name": "Channel",