1 files changed, 3 insertions, 3 deletions
diff --git a/src/merge_file.h b/src/merge_file.h
index 1aa34893d..0af2f0a57 100644
--- a/src/merge_file.h
+++ b/src/merge_file.h
@@ -16,7 +16,7 @@ typedef struct {
 	char *path;
 	unsigned int mode;
 	mmfile_t mmfile;
-	
+
 	git_odb_object *odb_object;
 } git_merge_file_input;
 
@@ -24,10 +24,10 @@ typedef struct {
 
 typedef struct {
 	bool automergeable;
-	
+
 	const char *path;
 	int mode;
-	
+
 	unsigned char *data;
 	size_t len;
 } git_merge_file_result;