From 108b3a62e5b1ace725f3ddee06a701eddc19199e Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Sat, 11 Jul 2020 22:45:45 +0200
Subject: [PATCH] Update Exporter.hpp

revert merge issue
---
 include/assimp/Exporter.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/assimp/Exporter.hpp b/include/assimp/Exporter.hpp
index 6fcbafe92..15918dd47 100644
--- a/include/assimp/Exporter.hpp
+++ b/include/assimp/Exporter.hpp
@@ -110,9 +110,9 @@ public:
         ExportFormatEntry() :
                 mExportFunction(),
                 mEnforcePP() {
-            mDescription.id = NULL;
-            mDescription.description = NULL;
-            mDescription.fileExtension = NULL;
+            mDescription.id = nullptr;
+            mDescription.description = nullptr;
+            mDescription.fileExtension = nullptr;
         }
     };