Fixes

Src/IACore/inc/hpp/IACore/CLI.hpp

@@ -203,11 +203,7 @@ namespace ia
 
             for (const auto &v : t->Value.Switches)
             {
-<<<<<<< HEAD
-                printf(__CC_WHITE "\t/%s %s\n", v.ID.c_str(), v.Help.c_str());
-=======
                 printf(__CC_WHITE "//%s %s\n", v.ID.c_str(), v.Help.c_str());
->>>>>>> 6c3090f3c6cff06c4f79f28cbc85f43242be4283
             }
 
             printf(__CC_DEFAULT "\n");

Src/IACore/inc/hpp/IACore/Types.hpp

@@ -22,6 +22,7 @@
 
 namespace ia
 {
+    template<typename _value_type> using InitializerList = std::initializer_list<_value_type>;
     template<typename _value_type> using initializer_list = std::initializer_list<_value_type>;
 
 #undef VOID