From f68b94a38d8a8c7c31d9ecad07e5690aa3b206e6 Mon Sep 17 00:00:00 2001
From: Lucas Schons <ls80zyse@studserv.uni-leipzig.de>
Date: Sun, 13 Jan 2019 23:44:11 +0100
Subject: [PATCH] I dont understand this

---
 processing/wikiproc/tests/testthat/test-clean_html.R | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/processing/wikiproc/tests/testthat/test-clean_html.R b/processing/wikiproc/tests/testthat/test-clean_html.R
index 084e9b3..467230c 100644
--- a/processing/wikiproc/tests/testthat/test-clean_html.R
+++ b/processing/wikiproc/tests/testthat/test-clean_html.R
@@ -4,13 +4,9 @@ test_that("html cleansing works", {
   filename_raw <- "article-4-raw.html"
   filename_cleansed <- "article-4-cleansed.txt"
   html <- readChar(filename_raw, file.info(filename_raw)$size)
-<<<<<<< HEAD
+
   expected <- gsub("\\s", "", readChar(filename_cleansed, file.info(filename_cleansed)$size))
   actual <- gsub("\\s", "", clean_html(html))
-=======
-  expected <- readChar(filename_cleansed, file.info(filename_cleansed)$size)
-  actual <- clean_html(html)
->>>>>>> master
 
   expect_equal(expected, actual)
 })
-- 
GitLab