.../src/Plugin/Block/StatisticsPopularBlock.php    | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php
index 5e7c0a6..729f733 100755
--- a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php
+++ b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php
@@ -42,29 +42,6 @@ class StatisticsPopularBlock extends BlockBase implements ContainerFactoryPlugin
   protected $statisticsStorage;
 
   /**
-<<<<<<< HEAD
-=======
-   * Number of day's top views to display.
-   *
-   * @var int
-   */
-  protected $day_list;
-
-  /**
-   * Number of all time views to display.
-   *
-   * @var int
-   */
-  protected $all_time_list;
-
-  /**
-   * Number of most recent views to display.
-   *
-   * @var int
-   */
-  protected $last_list;
-
-  /**
    * Constructs an StatisticsPopularBlock object.
    *
    * @param array $configuration
@@ -98,7 +75,6 @@ public static function create(ContainerInterface $container, array $configuratio
   }
 
   /**
->>>>>>> statistics
    * {@inheritdoc}
    */
   public function defaultConfiguration() {