Fix

joshbmarshall · joshbmarshall · commit 08fc7b5f7f7e · 2020-09-23T17:33:59.000+10:00
diff --git a/src/FormField.php b/src/FormField.php
@@ -73,8 +73,6 @@ public function setContent($data) {
         return $this;
     }
 
-<<<<<<< Updated upstream
-=======
     public function renderSelectOptions() {
         ob_start();
         foreach ($this->select_options as $value => $text) {
@@ -85,7 +83,6 @@ public function renderSelectOptions() {
         return ob_get_clean();
     }
 
->>>>>>> Stashed changes
     public function render() {
         if ($this->content) {
             return $this->content;

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,6 @@ public function setContent($data) {`
`73`	`73`	`return $this;`
`74`	`74`	`}`
`75`	`75`
`76`		`-<<<<<<< Updated upstream`
`77`		`-=======`
`78`	`76`	`public function renderSelectOptions() {`
`79`	`77`	`ob_start();`
`80`	`78`	`foreach ($this->select_options as $value => $text) {`
`@@ -85,7 +83,6 @@ public function renderSelectOptions() {`
`85`	`83`	`return ob_get_clean();`
`86`	`84`	`}`
`87`	`85`
`88`		`->>>>>>> Stashed changes`
`89`	`86`	`public function render() {`
`90`	`87`	`if ($this->content) {`
`91`	`88`	`return $this->content;`