From d943a2be378c766b9f50780b7db124db37103545 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Thu, 2 May 2019 17:05:07 -0700
Subject: [PATCH] Fix up bad merge conflict fix.

---
 kern/pmap.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/kern/pmap.c b/kern/pmap.c
index 318f867..f56345d 100644
--- a/kern/pmap.c
+++ b/kern/pmap.c
@@ -211,11 +211,6 @@ mem_init(void)
 	boot_map_region(kern_pgdir,
 			KSTACKTOP-KSTKSIZE, KSTKSIZE,
 			PADDR(bootstack), PTE_W);
-<<<<<<< HEAD
-	kern_pgdir[PDX(KSTACKTOP-KSTKSIZE)] |= PTE_W;
-	kern_pgdir[PDX(KSTACKTOP-KSTKSIZE)] &= ~PTE_U;
-=======
->>>>>>> lab2
 
 	//////////////////////////////////////////////////////////////////////
 	// Map all of physical memory at KERNBASE.