| Chunk |
|---|
| Conflicting content |
|---|
* 13 - Binomial heap * 14 - Lazy Binomial heap * 15 - Fibonacci heap <<<<<<< HEAD * 16 - Union-find * 17 - Trie */ final static int DEFAULT_DS = 17; ======= * 16 - Union-find */ final static int DEFAULT_DS = 0; >>>>>>> b6136c2c276655ee943bd6b238750793bf9cd266 private static final long serialVersionUID = -5202486006824196688L; |
| Solution content |
|---|
* 13 - Binomial heap * 14 - Lazy Binomial heap * 15 - Fibonacci heap * 16 - Union-find * 17 - Trie */ final static int DEFAULT_DS = 17; private static final long serialVersionUID = -5202486006824196688L; |
| File |
|---|
| AlgVis.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Comment |