From 33d219324a60e2d60fbcddadc106931c61254e96 Mon Sep 17 00:00:00 2001
From: Jait Jacob <jai8.jacob@gmail.com>
Date: Mon, 26 Feb 2024 10:53:22 +0530
Subject: [PATCH] remove unwanted lines

---
 .gitattributes | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 59b08deb0..c1789ac37 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,10 +10,6 @@
 /docs/analytics/** -linguist-documentation
 /website/** linguist-documentation
 
-<<<<<<< Updated upstream
-# Auto detect text files and perform LF normalization
-* text=auto
-=======
 # Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
 
@@ -22,4 +18,3 @@
 *.cpp text
 *.h text
 *.pot
->>>>>>> Stashed changes