resolve conflicts after merge

devshgraphicsprogramming · devshgraphicsprogramming · commit ebe1b01e2bee · 2023-03-18T22:31:45.000+01:00
diff --git a/include/nbl/core/StorageTrivializer.h b/include/nbl/core/StorageTrivializer.h
@@ -1,5 +1,5 @@
-#ifndef __NBL_CORE_STORAGE_TRIVIALIZER_H_INCLUDED__
-#define __NBL_CORE_STORAGE_TRIVIALIZER_H_INCLUDED__
+#ifndef _NBL_CORE_STORAGE_TRIVIALIZER_H_INCLUDED_
+#define _NBL_CORE_STORAGE_TRIVIALIZER_H_INCLUDED_
 
 namespace nbl::core
 {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-#ifndef __NBL_CORE_STORAGE_TRIVIALIZER_H_INCLUDED__`
`2`		`-#define __NBL_CORE_STORAGE_TRIVIALIZER_H_INCLUDED__`
	`1`	`+#ifndef _NBL_CORE_STORAGE_TRIVIALIZER_H_INCLUDED_`
	`2`	`+#define _NBL_CORE_STORAGE_TRIVIALIZER_H_INCLUDED_`
`3`	`3`
`4`	`4`	`namespace nbl::core`
`5`	`5`	`{`