smashwilson/merge-conflicts — pull request #54 by frk1705 (2014-05-25 01:27:54+00:00)
Title: Fix git error using sideview

Rightclick -> `Resolve. Entire File Ours/Theirs` threw an error when the mouse was not __exactly__ at the parental

```js
@li click: 'navigate', class: 'list-item navigate'
```

item. This patch enables them on the children aswell.