Conflicts: endpoints/web.py static/directives/signup-form.html static/js/app.js static/js/controllers.js static/partials/landing.html static/partials/view-repo.html test/data/test.db |
||
|---|---|---|
| .. | ||
| registry/sharedimages | ||
| sample/diffs | ||
| test.db | ||
Conflicts: endpoints/web.py static/directives/signup-form.html static/js/app.js static/js/controllers.js static/partials/landing.html static/partials/view-repo.html test/data/test.db |
||
|---|---|---|
| .. | ||
| registry/sharedimages | ||
| sample/diffs | ||
| test.db | ||