merging jambazov > trunk

[osqa.git] / osqa.iml

diff --git a/osqa.iml b/osqa.iml
index 24046e319475abaffab74222b2342e76a5732c50..aa15d1094a943ac3d4a4cc5dba35f9d0efe12591 100644 (file)
--- a/osqa.iml
+++ b/osqa.iml
@@ -4,12 +4,12 @@
     <facet type="django" name="Django">\r
       <configuration>\r
         <option name="rootFolder" value="$MODULE_DIR$" />\r
-        <option name="templatesFolder" value="" />\r
-        <option name="settingsModule" value="osqa" />\r
+        <option name="templatesFolder" value="$MODULE_DIR$/forum/skins/default/templates" />\r
+        <option name="settingsModule" value="settings.py" />\r
       </configuration>\r
     </facet>\r
   </component>\r
-  <component name="NewModuleRootManager">\r
+  <component name="NewModuleRootManager" inherit-compiler-output="false">\r
     <content url="file://$MODULE_DIR$" />\r
     <orderEntry type="inheritedJdk" />\r
     <orderEntry type="sourceFolder" forTests="false" />\r