solve merge conflict with develop

2026-02-19 11:29:08 -06:00 · 2016-04-20 15:03:51 -04:00
parent 9bb326b7eb 248014b6c2
commit 07dfafeddb
182 changed files with 10662 additions and 3631 deletions
--- a/include/openspace/engine/configurationmanager.h
+++ b/include/openspace/engine/configurationmanager.h
@@ -116,7 +116,7 @@ public:
     * configuration file
     * \pre \p filename must not be empty
     */
-	void loadFromFile(const std::string& filename);
+    void loadFromFile(const std::string& filename);

 private:
    /**
@@ -126,7 +126,7 @@ private:
     * \return <code>true</code> if the configuration file was complete;
     * <code>false</code> otherwise
     */
-	bool checkCompleteness() const;
+    bool checkCompleteness() const;
 };

 } // namespace openspace