Merge branch 'master' of github.com:vascocc/ngx-drag-to-select

Rebase
d3lm · Nov 4, 2019 · bdbab2b · bdbab2b
2 parents 8c8398b + 24e50c6
commit bdbab2b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -238,7 +238,6 @@ shortcuts: {
 
 **Inputs**
 
-<<<<<<< HEAD
 | Input                 | Type       | Default | Description                                                                                                   |
 | --------------------- | ---------- | ------- | ------------------------------------------------------------------------------------------------------------- |
 | selectedItems         | Array<any> | /       | Collection of items that are currently selected                                                               |