Merge branch 'taljacobson-master'

aagarwal1012 · Nov 21, 2018 · f7c07c6 · f7c07c6
2 parents 9f9de6e + 44dd35e
commit f7c07c6
Show file tree

Hide file tree

Showing 26 changed files with 434 additions and 1,894 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 .DS_Store
 .dart_tool/
-.idea
 
 .packages
 .pub/
@@ -10,10 +9,11 @@ ios/.generated/
 ios/Flutter/Generated.xcconfig
 ios/Runner/GeneratedPluginRegistrant.*
 
-*.iml         // IntelliJ
-*.ipr         // IntelliJ
-*.iws         // IntelliJ
-.idea/        // IntelliJ
+# IntelliJ
+*.iml
+*.ipr
+*.iws
+.idea
 
 doc/api/
 
@@ -23,4 +23,5 @@ doc/api/
                  # project includes source files written in JavaScript.
 *.js_
 *.js.deps
-*.js.map
+*.js.map
+.vscode/