Simon Schick 0b0d27cd8c sort and add conflict

2017-11-21 23:51:00 +01:00

..

elasticsearch-tests.ts

…

index.d.ts

sort and add conflict

2017-11-21 23:51:00 +01:00

tsconfig.json

…

tslint.json

fix lint even more

2017-11-21 23:27:54 +01:00