Fix conflicts

danielcardeenas · Apr 12, 2020 · d9f5cf8 · d9f5cf8
2 parents 7295cb1 + a1f01da
commit d9f5cf8
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 31 deletions.
diff --git a/.npmignore b/.npmignore
@@ -6,3 +6,10 @@ session-*
 assets
 img
 docs
+CONTRIBUTING.md
+UPDATES.md
+app.ts
+app.js
+app2.js
+LICENSE
+CHANGELOG.md