CodeYourFuture
diff --git a/‎Wireframe/style.css‎
Lines changed: 1 addition & 3 deletions b/‎Wireframe/style.css‎
Lines changed: 1 addition & 3 deletions
@@ -166,9 +166,7 @@ footer p {
   padding-left: 15px;
   padding-right: 15px;
   border-bottom: none;
-  <<<<<<< HEAD
-  /* optional: remove the thick bar */
-  =======>>>>>>>59daf8a (Updated wireframe HTML and CSS) border-radius: 10px;
+  border-radius: 10px;
 
 
 }
Original file line number	Diff line number	Diff line change
`@@ -166,9 +166,7 @@ footer p {`
`166`	`166`	`padding-left: 15px;`
`167`	`167`	`padding-right: 15px;`
`168`	`168`	`border-bottom: none;`
`169`		`- <<<<<<< HEAD`
`170`		`- /* optional: remove the thick bar */`
`171`		`- =======>>>>>>>59daf8a (Updated wireframe HTML and CSS) border-radius: 10px;`
	`169`	`+ border-radius: 10px;`
`172`	`170`
`173`	`171`
`174`	`172`	`}`