Resolve .gitignore conflict

project-aero · Feb 23, 2018 · c20b927 · c20b927
1 parent 0e47cc9
commit c20b927
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/eric-figs/.gitignore b/eric-figs/.gitignore
@@ -0,0 +1,7 @@
+# Packrat
+packrat/lib*/
+packrat/src
+
+# Ignored folders
+sketches/
+design/