From d0c92e30bec1f92dd1ab3e02431dccde6c4c0c8a Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Mon, 15 Jan 2018 19:07:33 -0800
Subject: [PATCH] conflict resolution again, temp. move LogAux.h

---
 {include/assimp => code}/LogAux.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
 rename {include/assimp => code}/LogAux.h (97%)

diff --git a/include/assimp/LogAux.h b/code/LogAux.h
similarity index 97%
rename from include/assimp/LogAux.h
rename to code/LogAux.h
index f2bc14d54..df1c8ba35 100644
--- a/include/assimp/LogAux.h
+++ b/code/LogAux.h
@@ -45,18 +45,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_LOGAUX_H
 #define INCLUDED_AI_LOGAUX_H
 
-#include "TinyFormatter.h"
-#include "Exceptional.h"
+#include <assimp/TinyFormatter.h>
+#include <assimp/Exceptional.h>
 #include <assimp/DefaultLogger.hpp>
 
 namespace Assimp {
 
-template <class TDeriving>
-class LogFunctions
-{
-
+template<class TDeriving>
+class LogFunctions {
 public:
-
     // ------------------------------------------------------------------------------------------------
     static void ThrowException(const std::string& msg)
     {