# Conflicts: # public/views/onboarding/terms.html # src/sass/views/onboarding/terms-of-use.scss |
||
|---|---|---|
| .. | ||
| img | ||
| roboto-font | ||
| views | ||
| cordova.js | ||
| index.html | ||
# Conflicts: # public/views/onboarding/terms.html # src/sass/views/onboarding/terms-of-use.scss |
||
|---|---|---|
| .. | ||
| img | ||
| roboto-font | ||
| views | ||
| cordova.js | ||
| index.html | ||