Resolve merge conflicts

rpg-docs/client/style/main.scss

@@ -57,7 +57,6 @@ paper-button {
 	cursor: pointer;
 }
 
-<<<<<<< HEAD
 .pre-wrap, .prewrap{
 	white-space: pre-wrap;
 }
@@ -68,8 +67,8 @@ paper-button {
 
 .fullwidth {
 	width: 100%;
-=======
+}
+
 .fab-buffer {
     height: 100px;
->>>>>>> origin/master
 }