search

JoshDSommer / nativescript-ngx-slides

A NativeScript + Angular module for to add a slides component to your mobile app
Other
45 stars 34 forks source link

Merge conflict marker in slides.component.ts (npm) #18

Closed Eclektic closed 7 years ago

Eclektic commented 7 years ago

Hi,

You have some merge conflict marker in slides.component.ts (NPM). See following error when building with your plugin :

`node_modules/nativescript-ng2-slides/slides/app/slides/slides.component.ts(127,1): error TS1185: Merge conflict marker encountered.

node_modules/nativescript-ng2-slides/slides/app/slides/slides.component.ts(129,1): error TS1185: Merge conflict marker encountered.

node_modules/nativescript-ng2-slides/slides/app/slides/slides.component.ts(133,1): error TS1185: Merge conflict marker encountered. `

I have installed the latest releases from npm.

JoshDSommer commented 7 years ago

Sorry about that, I'll get that fixed here. asap

JoshDSommer commented 7 years ago

should be good to go in 0.1.1