Merge pull request #40 from AlpineMapsOrg/test_branch_for_pull_request

Update README.md

README.md

@@ -37,6 +37,6 @@ We use Qt Creator (with mingw on Windows), which is the only tested setup atm an
 * files are CamelCase if the content is a CamelCase class. otherwise they are snake_case, and have a snake_case namespace with stuff.
 * the folder/structure.h is reflected in namespace folder::structure{ .. }
 * indent with space only, indent 4 spaces
-* ideally, use clang-format with the WebKit style  
-  (in case you use Qt Creator, go to Preferences -> C++ -> Code Style: Formatting mode: Full, Format while typing, Format edited code on file save, Clang-Format Style -> BasedOnStyle=WebKit)
+* ideally, use the clang-format file provided with the project
+  (in case you use Qt Creator, go to Preferences -> C++ -> Code Style: Formatting mode: Full, Format while typing, Format edited code on file save, don't override formatting)