fix

gradio-app · Jan 23, 2025 · 2cb24ea · 2cb24ea
1 parent 4e4c4f8
commit 2cb24ea
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/js/imageeditor/Index.svelte b/js/imageeditor/Index.svelte
@@ -56,10 +56,6 @@
 		accept_blobs: (a: any) => void;
 	};
 	export let canvas_size: [number, number];
-<<<<<<< HEAD
-
-=======
->>>>>>> e69a2b601 (add code)
 	export let fixed_canvas = false;
 	export let show_fullscreen_button = true;
 	export let full_history: any = null;