From 3add03dcc067244e21ca41abd3220f966c627b17 Mon Sep 17 00:00:00 2001
From: Isuru Samarathunga <isuru.00.aravinda@gmail.com>
Date: Fri, 31 Oct 2025 11:16:30 +0530
Subject: [PATCH] Fixes

---
 Src/IACore/inc/hpp/IACore/CLI.hpp   | 4 ----
 Src/IACore/inc/hpp/IACore/Types.hpp | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Src/IACore/inc/hpp/IACore/CLI.hpp b/Src/IACore/inc/hpp/IACore/CLI.hpp
index cf14c7c..0ed752e 100644
--- a/Src/IACore/inc/hpp/IACore/CLI.hpp
+++ b/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");
diff --git a/Src/IACore/inc/hpp/IACore/Types.hpp b/Src/IACore/inc/hpp/IACore/Types.hpp
index 9a9e050..befbb88 100644
--- a/Src/IACore/inc/hpp/IACore/Types.hpp
+++ b/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