Resolving Merge Conflicts

Author: farfromunique

classes/attribute.class.php

@@ -82,5 +82,4 @@ private function buildPrint() {
 	public function showPrint() {
 		return $this->printCode;
 	}
-}
-?>
+}

classes/attributeGroup.class.php

@@ -47,4 +47,3 @@ public function showPrint() {
 		return $this->printCode;
 	}
 }
-?>

classes/blood.class.php

@@ -43,4 +43,3 @@ public function showPrint() {
 		return $this->printCode;
 	}
 }
-?>

classes/bloodPool.class.php

@@ -60,4 +60,3 @@ public function showPrint() {
 		return $this->printCode;
 	}
 }
-?>

classes/dot.class.php

@@ -46,4 +46,3 @@ public function showPrint() {
 		return $this->printCode;
 	}
 }
-?>

classes/navbar.class.php

@@ -108,4 +108,3 @@ public function showBackgrounds() {
 			return $this->backgroundCode;
 		}
 	}
-?>

classes/printable.class.php

@@ -27,7 +27,7 @@ private function buildCode() {
 
 								'<div id="plainText" class="section">' . "\n";
 
-					$this->code .= '<div id="text1" class="lefty">' . "\n" .
+			$this->code .=		'<div id="text1" class="lefty">' . "\n" .
 										'Character\'s Name:' . "\n" .
 										'<span class="plain">' . $this->data['fluff']['character'] . '</span>' . "\n" .
 										'<br />' . "\n" .
@@ -139,14 +139,12 @@ private function buildCode() {
 								break;
 						}
 					}
-			$this->code .= 	'</div>' . "\n";
+				$this->code .= 	'</div>' . "\n";
+				}
 			}
 		}
-		}
 
 		public function showCode() {
 			return $this->code;
 		}
 	}
-
-?>

printme.php

@@ -221,5 +221,4 @@
 			'checked' => 1
 		],
 		'blood' =>  10
-	];
-	?>
+	];