Skip to content

Commit

Permalink
Fix merge conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kalynrobinson
kalynrobinson committed Nov 3, 2017
2 parents 0a5f965 + 5938009 commit fea0d7c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Replaces pagination links with AJAX calls.
```
### Technical
* Uses a custom XF handler that pigeons code and logic from XFAjaxSubmit
* My JavaScript is terrible, don't emulate me
* My JavaScript is terrible, don't emulate me

0 comments on commit fea0d7c

Please sign in to comment.