update

8 months ago · 32ecf02994
parent ab49f55b24
commit 32ecf02994
1 changed files with 7 additions and 0 deletions
--- a/7
+++ b/7
@ -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?