gitingored changes

uonafya · Jun 21, 2024 · 3c8527b · 3c8527b
1 parent 8c1bc4a
commit 3c8527b
Show file tree

Hide file tree

Showing 200 changed files with 2 additions and 9 deletions.
diff --git a/cpims/__pycache__/emails.cpython-310.pyc b/cpims/__pycache__/emails.cpython-310.pyc
diff --git a/cpims/__pycache__/settings.cpython-310.pyc b/cpims/__pycache__/settings.cpython-310.pyc
diff --git a/cpims/__pycache__/urls.cpython-310.pyc b/cpims/__pycache__/urls.cpython-310.pyc
diff --git a/cpims/__pycache__/views.cpython-310.pyc b/cpims/__pycache__/views.cpython-310.pyc
diff --git a/cpims/__pycache__/wsgi.cpython-310.pyc b/cpims/__pycache__/wsgi.cpython-310.pyc
diff --git a/cpims/settings.py b/cpims/settings.py
@@ -106,13 +106,8 @@
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'cpims_gok',
-<<<<<<< HEAD
         'USER': 'postgres',
         'PASSWORD': 'test',
-=======
-        'USER': 'cpimsdbuser',
-        'PASSWORD': 'Xaen!ee8',
->>>>>>> mobile_approval
         'HOST': '127.0.0.1',
         'PORT': '5432', }
 }

diff --git a/cpovc_access/__pycache__/__init__.cpython-310.pyc b/cpovc_access/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/admin.cpython-310.pyc b/cpovc_access/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/apps.cpython-310.pyc b/cpovc_access/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/authentication.cpython-310.pyc b/cpovc_access/__pycache__/authentication.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/decorators.cpython-310.pyc b/cpovc_access/__pycache__/decorators.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/forms.cpython-310.pyc b/cpovc_access/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/functions.cpython-310.pyc b/cpovc_access/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/handlers.cpython-310.pyc b/cpovc_access/__pycache__/handlers.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/models.cpython-310.pyc b/cpovc_access/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/password_change.cpython-310.pyc b/cpovc_access/__pycache__/password_change.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/password_strength.cpython-310.pyc b/cpovc_access/__pycache__/password_strength.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/settings.cpython-310.pyc b/cpovc_access/__pycache__/settings.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/signals.cpython-310.pyc b/cpovc_access/__pycache__/signals.cpython-310.pyc
diff --git a/cpovc_access/__pycache__/views.cpython-310.pyc b/cpovc_access/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_afc/__pycache__/__init__.cpython-310.pyc b/cpovc_afc/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_afc/__pycache__/admin.cpython-310.pyc b/cpovc_afc/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_afc/__pycache__/apps.cpython-310.pyc b/cpovc_afc/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_afc/__pycache__/forms.cpython-310.pyc b/cpovc_afc/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_afc/__pycache__/functions.cpython-310.pyc b/cpovc_afc/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_afc/__pycache__/models.cpython-310.pyc b/cpovc_afc/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_afc/__pycache__/settings.cpython-310.pyc b/cpovc_afc/__pycache__/settings.cpython-310.pyc
diff --git a/cpovc_afc/__pycache__/urls.cpython-310.pyc b/cpovc_afc/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_afc/__pycache__/views.cpython-310.pyc b/cpovc_afc/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_afc/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_afc/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_afc/migrations/__pycache__/0002_initial.cpython-310.pyc b/cpovc_afc/migrations/__pycache__/0002_initial.cpython-310.pyc
diff --git a/cpovc_afc/migrations/__pycache__/0003_initial.cpython-310.pyc b/cpovc_afc/migrations/__pycache__/0003_initial.cpython-310.pyc
diff --git a/cpovc_afc/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_afc/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_api/__pycache__/__init__.cpython-310.pyc b/cpovc_api/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_api/__pycache__/serializers.cpython-310.pyc b/cpovc_api/__pycache__/serializers.cpython-310.pyc
diff --git a/cpovc_api/__pycache__/urls.cpython-310.pyc b/cpovc_api/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_api/__pycache__/views.cpython-310.pyc b/cpovc_api/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_auth/__pycache__/__init__.cpython-310.pyc b/cpovc_auth/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_auth/__pycache__/admin.cpython-310.pyc b/cpovc_auth/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_auth/__pycache__/apps.cpython-310.pyc b/cpovc_auth/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_auth/__pycache__/decorators.cpython-310.pyc b/cpovc_auth/__pycache__/decorators.cpython-310.pyc
diff --git a/cpovc_auth/__pycache__/forms.cpython-310.pyc b/cpovc_auth/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_auth/__pycache__/functions.cpython-310.pyc b/cpovc_auth/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_auth/__pycache__/models.cpython-310.pyc b/cpovc_auth/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_auth/__pycache__/perms.cpython-310.pyc b/cpovc_auth/__pycache__/perms.cpython-310.pyc
diff --git a/cpovc_auth/__pycache__/urls.cpython-310.pyc b/cpovc_auth/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_auth/__pycache__/views.cpython-310.pyc b/cpovc_auth/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_auth/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_auth/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_auth/migrations/__pycache__/0002_initial.cpython-310.pyc b/cpovc_auth/migrations/__pycache__/0002_initial.cpython-310.pyc
diff --git a/cpovc_auth/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_auth/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_ctip/__pycache__/__init__.cpython-310.pyc b/cpovc_ctip/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_ctip/__pycache__/admin.cpython-310.pyc b/cpovc_ctip/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_ctip/__pycache__/apps.cpython-310.pyc b/cpovc_ctip/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_ctip/__pycache__/forms.cpython-310.pyc b/cpovc_ctip/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_ctip/__pycache__/functions.cpython-310.pyc b/cpovc_ctip/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_ctip/__pycache__/models.cpython-310.pyc b/cpovc_ctip/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_ctip/__pycache__/settings.cpython-310.pyc b/cpovc_ctip/__pycache__/settings.cpython-310.pyc
diff --git a/cpovc_ctip/__pycache__/urls.cpython-310.pyc b/cpovc_ctip/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_ctip/__pycache__/views.cpython-310.pyc b/cpovc_ctip/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_ctip/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_ctip/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_ctip/migrations/__pycache__/0002_initial.cpython-310.pyc b/cpovc_ctip/migrations/__pycache__/0002_initial.cpython-310.pyc
diff --git a/cpovc_ctip/migrations/__pycache__/0003_initial.cpython-310.pyc b/cpovc_ctip/migrations/__pycache__/0003_initial.cpython-310.pyc
diff --git a/cpovc_ctip/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_ctip/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_dashboard/__pycache__/__init__.cpython-310.pyc b/cpovc_dashboard/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_dashboard/__pycache__/charts.cpython-310.pyc b/cpovc_dashboard/__pycache__/charts.cpython-310.pyc
diff --git a/cpovc_dashboard/__pycache__/forms.cpython-310.pyc b/cpovc_dashboard/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_dashboard/__pycache__/functions.cpython-310.pyc b/cpovc_dashboard/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_dashboard/__pycache__/parameters.cpython-310.pyc b/cpovc_dashboard/__pycache__/parameters.cpython-310.pyc
diff --git a/cpovc_dashboard/__pycache__/queries.cpython-310.pyc b/cpovc_dashboard/__pycache__/queries.cpython-310.pyc
diff --git a/cpovc_dashboard/__pycache__/urls.cpython-310.pyc b/cpovc_dashboard/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_dashboard/__pycache__/views.cpython-310.pyc b/cpovc_dashboard/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_forms/__pycache__/__init__.cpython-310.pyc b/cpovc_forms/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_forms/__pycache__/admin.cpython-310.pyc b/cpovc_forms/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_forms/__pycache__/apps.cpython-310.pyc b/cpovc_forms/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_forms/__pycache__/forms.cpython-310.pyc b/cpovc_forms/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_forms/__pycache__/functions.cpython-310.pyc b/cpovc_forms/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_forms/__pycache__/models.cpython-310.pyc b/cpovc_forms/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_forms/__pycache__/urls.cpython-310.pyc b/cpovc_forms/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_forms/__pycache__/views.cpython-310.pyc b/cpovc_forms/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_forms/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_forms/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_forms/migrations/__pycache__/0002_initial.cpython-310.pyc b/cpovc_forms/migrations/__pycache__/0002_initial.cpython-310.pyc
diff --git a/cpovc_forms/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_forms/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_gis/__pycache__/__init__.cpython-310.pyc b/cpovc_gis/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_gis/__pycache__/admin.cpython-310.pyc b/cpovc_gis/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_gis/__pycache__/apps.cpython-310.pyc b/cpovc_gis/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_gis/__pycache__/models.cpython-310.pyc b/cpovc_gis/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_gis/__pycache__/urls.cpython-310.pyc b/cpovc_gis/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_gis/__pycache__/views.cpython-310.pyc b/cpovc_gis/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_help/__pycache__/__init__.cpython-310.pyc b/cpovc_help/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_help/__pycache__/admin.cpython-310.pyc b/cpovc_help/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_help/__pycache__/apps.cpython-310.pyc b/cpovc_help/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_help/__pycache__/models.cpython-310.pyc b/cpovc_help/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_help/__pycache__/urls.cpython-310.pyc b/cpovc_help/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_help/__pycache__/views.cpython-310.pyc b/cpovc_help/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_help/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_help/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_help/migrations/__pycache__/0002_initial.cpython-310.pyc b/cpovc_help/migrations/__pycache__/0002_initial.cpython-310.pyc
diff --git a/cpovc_help/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_help/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_main/__pycache__/__init__.cpython-310.pyc b/cpovc_main/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_main/__pycache__/admin.cpython-310.pyc b/cpovc_main/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_main/__pycache__/apps.cpython-310.pyc b/cpovc_main/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_main/__pycache__/country.cpython-310.pyc b/cpovc_main/__pycache__/country.cpython-310.pyc
diff --git a/cpovc_main/__pycache__/functions.cpython-310.pyc b/cpovc_main/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_main/__pycache__/models.cpython-310.pyc b/cpovc_main/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_main/__pycache__/utils.cpython-310.pyc b/cpovc_main/__pycache__/utils.cpython-310.pyc
diff --git a/cpovc_main/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_main/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_main/migrations/__pycache__/0002_initial.cpython-310.pyc b/cpovc_main/migrations/__pycache__/0002_initial.cpython-310.pyc
diff --git a/cpovc_main/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_main/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_manage/__pycache__/__init__.cpython-310.pyc b/cpovc_manage/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_manage/__pycache__/admin.cpython-310.pyc b/cpovc_manage/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_manage/__pycache__/apps.cpython-310.pyc b/cpovc_manage/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_manage/__pycache__/forms.cpython-310.pyc b/cpovc_manage/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_manage/__pycache__/functions.cpython-310.pyc b/cpovc_manage/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_manage/__pycache__/models.cpython-310.pyc b/cpovc_manage/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_manage/__pycache__/params.cpython-310.pyc b/cpovc_manage/__pycache__/params.cpython-310.pyc
diff --git a/cpovc_manage/__pycache__/telegram.cpython-310.pyc b/cpovc_manage/__pycache__/telegram.cpython-310.pyc
diff --git a/cpovc_manage/__pycache__/urls.cpython-310.pyc b/cpovc_manage/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_manage/__pycache__/views.cpython-310.pyc b/cpovc_manage/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_manage/__pycache__/vurugu.cpython-310.pyc b/cpovc_manage/__pycache__/vurugu.cpython-310.pyc
diff --git a/cpovc_manage/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_manage/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_manage/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_manage/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_ovc/__pycache__/__init__.cpython-310.pyc b/cpovc_ovc/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_ovc/__pycache__/admin.cpython-310.pyc b/cpovc_ovc/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_ovc/__pycache__/apps.cpython-310.pyc b/cpovc_ovc/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_ovc/__pycache__/forms.cpython-310.pyc b/cpovc_ovc/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_ovc/__pycache__/functions.cpython-310.pyc b/cpovc_ovc/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_ovc/__pycache__/models.cpython-310.pyc b/cpovc_ovc/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_ovc/__pycache__/urls.cpython-310.pyc b/cpovc_ovc/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_ovc/__pycache__/views.cpython-310.pyc b/cpovc_ovc/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_ovc/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_ovc/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_ovc/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_ovc/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_registry/__pycache__/__init__.cpython-310.pyc b/cpovc_registry/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_registry/__pycache__/admin.cpython-310.pyc b/cpovc_registry/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_registry/__pycache__/apps.cpython-310.pyc b/cpovc_registry/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_registry/__pycache__/forms.cpython-310.pyc b/cpovc_registry/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_registry/__pycache__/functions.cpython-310.pyc b/cpovc_registry/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_registry/__pycache__/models.cpython-310.pyc b/cpovc_registry/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_registry/__pycache__/urls.cpython-310.pyc b/cpovc_registry/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_registry/__pycache__/views.cpython-310.pyc b/cpovc_registry/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_registry/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_registry/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_registry/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_registry/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_registry/templatetags/__pycache__/__init__.cpython-310.pyc b/cpovc_registry/templatetags/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_registry/templatetags/__pycache__/app_class.cpython-310.pyc b/cpovc_registry/templatetags/__pycache__/app_class.cpython-310.pyc
diff --git a/cpovc_registry/templatetags/__pycache__/app_filters-.cpython-310.pyc b/cpovc_registry/templatetags/__pycache__/app_filters-.cpython-310.pyc
diff --git a/cpovc_registry/templatetags/__pycache__/app_filters.cpython-310.pyc b/cpovc_registry/templatetags/__pycache__/app_filters.cpython-310.pyc
diff --git a/cpovc_registry/templatetags/__pycache__/app_forms.cpython-310.pyc b/cpovc_registry/templatetags/__pycache__/app_forms.cpython-310.pyc
diff --git a/cpovc_registry/templatetags/__pycache__/git_version.cpython-310.pyc b/cpovc_registry/templatetags/__pycache__/git_version.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/__init__.cpython-310.pyc b/cpovc_reports/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/admin.cpython-310.pyc b/cpovc_reports/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/apps.cpython-310.pyc b/cpovc_reports/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/config.cpython-310.pyc b/cpovc_reports/__pycache__/config.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/documents.cpython-310.pyc b/cpovc_reports/__pycache__/documents.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/dq_queries.cpython-310.pyc b/cpovc_reports/__pycache__/dq_queries.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/forms.cpython-310.pyc b/cpovc_reports/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/functions.cpython-310.pyc b/cpovc_reports/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/models.cpython-310.pyc b/cpovc_reports/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/parameters.cpython-310.pyc b/cpovc_reports/__pycache__/parameters.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/queries.cpython-310.pyc b/cpovc_reports/__pycache__/queries.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/security.cpython-310.pyc b/cpovc_reports/__pycache__/security.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/urls.cpython-310.pyc b/cpovc_reports/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/utils.cpython-310.pyc b/cpovc_reports/__pycache__/utils.cpython-310.pyc
diff --git a/cpovc_reports/__pycache__/views.cpython-310.pyc b/cpovc_reports/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_reports/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_reports/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_reports/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_reports/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_settings/__pycache__/__init__.cpython-310.pyc b/cpovc_settings/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_settings/__pycache__/admin.cpython-310.pyc b/cpovc_settings/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_settings/__pycache__/apps.cpython-310.pyc b/cpovc_settings/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_settings/__pycache__/forms.cpython-310.pyc b/cpovc_settings/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_settings/__pycache__/functions.cpython-310.pyc b/cpovc_settings/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_settings/__pycache__/models.cpython-310.pyc b/cpovc_settings/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_settings/__pycache__/urls.cpython-310.pyc b/cpovc_settings/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_settings/__pycache__/views.cpython-310.pyc b/cpovc_settings/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_settings/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_settings/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_settings/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_settings/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_stat_inst/__pycache__/__init__.cpython-310.pyc b/cpovc_stat_inst/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_stat_inst/__pycache__/admin.cpython-310.pyc b/cpovc_stat_inst/__pycache__/admin.cpython-310.pyc
diff --git a/cpovc_stat_inst/__pycache__/apps.cpython-310.pyc b/cpovc_stat_inst/__pycache__/apps.cpython-310.pyc
diff --git a/cpovc_stat_inst/__pycache__/forms.cpython-310.pyc b/cpovc_stat_inst/__pycache__/forms.cpython-310.pyc
diff --git a/cpovc_stat_inst/__pycache__/functions.cpython-310.pyc b/cpovc_stat_inst/__pycache__/functions.cpython-310.pyc
diff --git a/cpovc_stat_inst/__pycache__/models.cpython-310.pyc b/cpovc_stat_inst/__pycache__/models.cpython-310.pyc
diff --git a/cpovc_stat_inst/__pycache__/parameters.cpython-310.pyc b/cpovc_stat_inst/__pycache__/parameters.cpython-310.pyc
diff --git a/cpovc_stat_inst/__pycache__/urls.cpython-310.pyc b/cpovc_stat_inst/__pycache__/urls.cpython-310.pyc
diff --git a/cpovc_stat_inst/__pycache__/views.cpython-310.pyc b/cpovc_stat_inst/__pycache__/views.cpython-310.pyc
diff --git a/cpovc_stat_inst/migrations/__pycache__/0001_initial.cpython-310.pyc b/cpovc_stat_inst/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/cpovc_stat_inst/migrations/__pycache__/__init__.cpython-310.pyc b/cpovc_stat_inst/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/cpovc_stat_inst/parameters.py b/cpovc_stat_inst/parameters.py
@@ -140,11 +140,9 @@
 FPERM['FMSI037F'] = {0: [''], 1: ['CRU'], 2: ['CRU'], 3: ['RUD']}
 FPERM['FMSI038F'] = {0: [''], 1: ['CRU'], 2: ['CRU'], 3: ['RUD']}
 
-<<<<<<< HEAD
-INSTM={}
-=======
+
 
 # missing
 INSTM = {}
 INSTM[''] = ['']
->>>>>>> mobile_approval
+
diff --git a/notifications/__pycache__/__init__.cpython-310.pyc b/notifications/__pycache__/__init__.cpython-310.pyc
diff --git a/notifications/__pycache__/admin.cpython-310.pyc b/notifications/__pycache__/admin.cpython-310.pyc
diff --git a/notifications/__pycache__/apps.cpython-310.pyc b/notifications/__pycache__/apps.cpython-310.pyc
diff --git a/notifications/__pycache__/functions.cpython-310.pyc b/notifications/__pycache__/functions.cpython-310.pyc
diff --git a/notifications/__pycache__/models.cpython-310.pyc b/notifications/__pycache__/models.cpython-310.pyc
diff --git a/notifications/__pycache__/settings.cpython-310.pyc b/notifications/__pycache__/settings.cpython-310.pyc
diff --git a/notifications/__pycache__/signals.cpython-310.pyc b/notifications/__pycache__/signals.cpython-310.pyc
diff --git a/notifications/__pycache__/urls.cpython-310.pyc b/notifications/__pycache__/urls.cpython-310.pyc
diff --git a/notifications/__pycache__/utils.cpython-310.pyc b/notifications/__pycache__/utils.cpython-310.pyc
diff --git a/notifications/__pycache__/views.cpython-310.pyc b/notifications/__pycache__/views.cpython-310.pyc
diff --git a/notifications/migrations/__pycache__/0001_initial.cpython-310.pyc b/notifications/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/...igrations/__pycache__/0002_alter_notification_id_alter_notification_level.cpython-310.pyc b/...igrations/__pycache__/0002_alter_notification_id_alter_notification_level.cpython-310.pyc
diff --git a/notifications/migrations/__pycache__/__init__.cpython-310.pyc b/notifications/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/notifications/templatetags/__pycache__/__init__.cpython-310.pyc b/notifications/templatetags/__pycache__/__init__.cpython-310.pyc
diff --git a/notifications/templatetags/__pycache__/notifications_tags.cpython-310.pyc b/notifications/templatetags/__pycache__/notifications_tags.cpython-310.pyc