Merge conflict code from purchase plugin

by

Home › Forums › JW Player 7 for WordPress › Merge conflict code from purchase plugin

Viewing 2 posts - 1 through 2 (of 2 total)
  • Author
    Posts
  • 10 August 2020 at 18:57 #8244
    mhwang
    Participant

    In jw-widget/jwppp-carousel-config.php lines 1-12 read

    <?php
    /**
    * JW Player carousel widget configuration
    * @author ilGhera
    <<<<<<< HEAD
    * @package jw-player-7-for-wp-premium/jw-widget
    * @version 2.0.0
    =======
    * @package jw-player-7-for-wp/jw-widget
    * @since 2.0.0
    >>>>>>> master
    */

    Since it’s in the comment block it doesn’t seem to be affecting any error but thought you might want to know and clean it up.

    • This topic was modified 3 years, 3 months ago by mhwang.
    11 August 2020 at 7:33 #8246
    ilGhera
    Keymaster

    Hi @mhwang,
    thanks for reporting this and you’re right, it’s just the file comment and it won’t create any problems.
    Already fixed for the new release.
    Thanks again.

  • Author
    Posts
Viewing 2 posts - 1 through 2 (of 2 total)
  • You must be logged in to reply to this topic.