Merge conflict code from purchase plugin

da

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

Stai vedendo 2 articoli - dal 1 a 2 (di 2 totali)
  • Autore
    Articoli
  • 10 Agosto 2020 alle 18:57 #8244
    mhwang
    Partecipante

    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.

    • Questo topic è stato modificato 3 anni, 3 mesi fa da mhwang.
    11 Agosto 2020 alle 7:33 #8246
    ilGhera
    Amministratore del forum

    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.

  • Autore
    Articoli
Stai vedendo 2 articoli - dal 1 a 2 (di 2 totali)
  • Devi essere connesso per rispondere a questo topic.