From 32ecf029945211d1fedd6904881e1fb44ff3dcd8 Mon Sep 17 00:00:00 2001
From: Yaser Alraddadi <yaseralraddadi@Yasers-MacBook-Pro-2.local>
Date: Mon, 9 Dec 2024 12:20:15 +0300
Subject: [PATCH] update

---
 justfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/justfile b/justfile
index 825cc507..044b6773 100644
--- a/justfile
+++ b/justfile
@@ -1,3 +1,10 @@
 cleanup:
     rm -rf ~/.local/state/nvim
     rm -rf ~/.local/share/nvim
+
+merge:
+    # git remote add upstream git@github.com:nvim-lua/kickstart.nvim.git
+    git checkout master
+    git fetch upstream
+    git merge upstream/master
+    # is there a conflict?