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

Compile error since merge conflict marker left from last PR #12

Closed greenstevester closed 6 years ago

greenstevester commented 7 years ago

In slides.component.ts, line 127....

<<<<<<< HEAD footerSection.clipToBounds = false;

        footerSection.clipToBounds = false;
    } else if (app.android) {
        footerSection.android.getParent().setClipChildren(false);

origin/master }