From 4ece250221d917209515c3ea4a6d3950e533de71 Mon Sep 17 00:00:00 2001 From: ggg27 <52841257+ggg27@users.noreply.github.com> Date: Thu, 12 Sep 2019 02:13:25 +0000 Subject: [PATCH] Fix Conflicts --- _includes/nav.html | 247 ++++++++++++++++++++++++++------------------- 1 file changed, 143 insertions(+), 104 deletions(-) diff --git a/_includes/nav.html b/_includes/nav.html index 485cb937..bbdf70b5 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -1,86 +1,115 @@ - + +