Commit 0c17ab1

committed

Fix conflicts

2 parents 382ac35 + d31577f commit 0c17ab1Copy full SHA for 0c17ab1

4 files changed

+246

-213

lines changed

.idea
- workspace.xml
dist
- focus.js
example/app/js
- focus.js
lib/views
- core-view.js

4 files changed

+246

-213

lines changed

`‎.idea/workspace.xml`

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)