fix: accepted git conflicts

src/components/editor/Toolbar.tsx

@@ -8,7 +8,7 @@ type ToolbarProps = {
   onExport: () => void
   onExportRenpy: () => void
   onImport: () => void
-  isSaving?: boolean
+  onProjectSettings: () => void
 }
 
 export default function Toolbar({
@@ -19,7 +19,7 @@ export default function Toolbar({
   onExport,
   onExportRenpy,
   onImport,
-  isSaving = false,
+  onProjectSettings,
 }: ToolbarProps) {
   return (
     <div className="flex items-center justify-between border-b border-zinc-200 bg-zinc-50 px-4 py-2 dark:border-zinc-700 dark:bg-zinc-800">
@@ -48,6 +48,12 @@ export default function Toolbar({
       </div>
 
       <div className="flex items-center gap-2">
+        <button
+          onClick={onProjectSettings}
+          className="rounded border border-zinc-300 bg-white px-3 py-1.5 text-sm font-medium text-zinc-700 hover:bg-zinc-50 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 dark:border-zinc-600 dark:bg-zinc-700 dark:text-zinc-200 dark:hover:bg-zinc-600 dark:focus:ring-offset-zinc-800"
+        >
+          Project Settings
+        </button>
         <button
           onClick={onSave}
           disabled={isSaving}