From 082129531859001619866e0c1ea25421b29059aa Mon Sep 17 00:00:00 2001
From: varnit goyal <github.cicd@navi.com>
Date: Wed, 15 Jan 2025 10:00:22 +0530
Subject: [PATCH] NTP-26125 | resolved merged conflicts

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 71545b7..dd11e69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ output.html
 packages/*/dist
 .idea
 lerna-debug.log
+.Ds_Store