fix conflict

unlegacy-devices · Nov 30, 2023 · d917bee · d917bee
1 parent f72da7a
commit d917bee
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/include/linux/fs.h b/include/linux/fs.h
@@ -1549,10 +1549,7 @@ struct file_operations {
 	long (*fallocate)(struct file *file, int mode, loff_t offset,
 			  loff_t len);
 	int (*show_fdinfo)(struct seq_file *m, struct file *f);
-<<<<<<< HEAD
 	/* get_lower_file is for stackable file system */
-=======
->>>>>>> 5545878... sdcardfs: Flag files as non-mappable
 	struct file* (*get_lower_file)(struct file *f);
 };