1 files changed, 0 insertions, 4 deletions
diff --git a/theme.toml b/theme.toml
index a530d39..6a00fdc 100644
--- a/theme.toml
+++ b/theme.toml
@@ -6,11 +6,7 @@ license = "MIT"
 licenselink = "https://github.com/themefisher/infinity-hugo/blob/master/LICENSE"
 description = "Hugo port of the Themefisher’s Infinity Template"
 homepage = "https://gethugothemes.com/products/infinity/"
-<<<<<<< HEAD
 tags = ['comming-soon', 'landing-page', 'themefisher', 'hugo-theme', 'hugo-templates', 'bootstrap4', 'gethugothemes']
-=======
-tags = ['comming-soon', 'landing-page', 'themefisher', 'hugo-theme', 'hugo-templates', 'bootstrap4','gethugothemes']
->>>>>>> bd097f86715d3994cc975c5331ad632e1ab61675
 features = ['bootstrap4','responsive']
 min_version = "0.64.0"