From cb3fe8c30102e637a0ce8cf6e4d64a59f330f680 Mon Sep 17 00:00:00 2001
From: Shwetha Jayaraj <shwetha.jayaraj@uconn.edu>
Date: Fri, 30 Jun 2023 20:57:02 -0400
Subject: [PATCH] init changes

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

diff --git a/.gitignore b/.gitignore
index 602ef95..72e20fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1 @@
-<<<<<<< HEAD
-
-=======
->>>>>>> 3246653 (my entire obs vault)
-.obsidian/cache
-.trash/
-.DS_Store
+.obsidian/cache .tash/ .DS_Store