From 101f4f62a8b8cf4380017c3240b03226f70ed311 Mon Sep 17 00:00:00 2001 From: JT Date: Tue, 8 Feb 2022 09:23:41 -0500 Subject: [PATCH] gitignore conflict fix --- .gitignore | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitignore b/.gitignore index 6956977c3..4c234e523 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -<<<<<<< HEAD /target /scratch **/*.rs.bk @@ -21,9 +20,3 @@ debian/nu/ # VSCode's IDE items .vscode/* -======= -history.txt -/target -/.vscode -.DS_Store ->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce