resolving merge conflicts

This commit is contained in:
IgnatzHome 2018-05-17 20:21:07 +02:00
commit 9518a5c11e
30 changed files with 880 additions and 58 deletions

1
.gitignore vendored
View file

@ -15,3 +15,4 @@ package-lock.json
**/prime
**/*.snap
snap/.snapcraft/
.idea