branch merge cleanup

Jasata · Sep 13, 2020 · 94bad19 · 94bad19
2 parents a237409 + fa06bb1
commit 94bad19
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -404,7 +404,7 @@ def __str__(self):
 files['application.conf'] = ConfigFile(
     ROOTPATH + '/instance/application.conf',
     """
-# -*- coding: utf-8 -*-
+s# -*- coding: utf-8 -*-
 #
 # Turku University (2019) Department of Future Technologies
 # Website for Course Virtualization Project