fixed conflicts

ardabeyazoglu · ardabeyazoglu · commit 7e65a910c7a9 · 2025-06-06T17:17:18.000+02:00
diff --git a/src/PhpWord/Element/CheckBox.php b/src/PhpWord/Element/CheckBox.php
@@ -92,7 +92,7 @@ public function setDefault(bool $default = false)
     }
 
     /**
-     * Set default checked status.
+     * Get default checked status.
      */
     public function isDefault(): bool
     {

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function setDefault(bool $default = false)`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/**`
`95`		`- * Set default checked status.`
	`95`	`+ * Get default checked status.`
`96`	`96`	`*/`
`97`	`97`	`public function isDefault(): bool`
`98`	`98`	`{`