Merge branch 'master' of github.com:IgniteRobotics/Robot-2021

y0shi · y0shi · commit 8689685fb784 · 2021-04-04T20:18:36.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -159,4 +159,6 @@ bin/
 imgui.ini
 
 
-# End of https://www.gitignore.io/api/c++,java,linux,macos,gradle,windows,visualstudiocode
+#build files
+build/
+.settings/
