git conflict flags were still in the plugin m file.
git conflict flags were still in the plugin m file.

AppBlade/SDK-PhoneGap-Plugin,AppBlade/SDK-PhoneGap-Plugin,AppBlade/SDK-PhoneGap-Plugin,AppBlade/SDK-PhoneGap-Plugin,AppBlade/SDK-PhoneGap-Plugin