solve merge conflict

RangeShifter · Feb 1, 2024 · 40c9918 · 40c9918
2 parents 73b972a + 88d81e3
commit 40c9918
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -82,6 +82,6 @@ vignettes/*.pdf
 # compilation files
 *.o
 
-# Visual Studio
+# Visual Studio files
 .vs/
 out/