Skip to content

Commit e253bd3

Browse files
authored
Fix merge conflict in _config.yml
1 parent 5f6286a commit e253bd3

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

_config.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
title: MSPortals.io - Microsoft Portals
2-
<<<<<<< HEAD
3-
theme: jekyll-theme-hacker
4-
=======
52
description: A comprehensive directory of all Microsoft portals in one place
63
theme: jekyll-theme-hacker
74
plugins:
85
- jekyll-sitemap
96
- jekyll-feed
10-
>>>>>>> parent of 5153c12 (Fix Jekyll build and add improved site configuration)
7+
- jekyll-seo-tag
118

129
# Google Analytics
1310
google_analytics: G-N9G6QSTG3P

0 commit comments

Comments
 (0)