Skip to content

Commit

Permalink
Solved a conflict I missed
Browse files Browse the repository at this point in the history
facundoy committed Nov 9, 2024
1 parent 34bede5 commit 45e6143
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/haz3lweb/view/Page.re
Original file line number Diff line number Diff line change
@@ -72,15 +72,12 @@ let handlers =
inject(PerformAction(Paste(pasted_text)));
}),
];
<<<<<<< HEAD
model.settings.editing_prompt
|| modle.settings.editing_title
|| model.settings.editing_test_val_rep
|| model.settings.editing_mut_test_rep
|| model.settings.editing_impl_grd_rep
|| model.settings.editing_module_name
=======
model.settings.editing_title
>>>>>>> title-editor
? attrs : attrs @ [Attr.on_keypress(_ => Effect.Prevent_default)];
};

0 comments on commit 45e6143

Please sign in to comment.