fix conflict

sbgraves237 · sbgraves237 · commit ecc5a1e98371 · 2022-06-10T09:45:06.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -4,10 +4,7 @@
 .Ruserdata
 .Rbuildignore
 .DS_Store
-<<<<<<< HEAD
-
 inst/doc
-=======
 inst/.DS_Store
-.github
->>>>>>> 6f7aa3c565bd65216a046ee8bae7ec82122c217c
+^\.github$
+
