summary refs log tree commit diff homepage
path: root/merge.c
diff options
context:
space:
mode:
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/merge.c b/merge.c
index 9787b43..dc81756 100644
--- a/merge.c
+++ b/merge.c
@@ -1,5 +1,4 @@
-/*
- * Copyright (c) 2017, June McEnroe <june@causal.agency>
+/* Copyright (c) 2017, June McEnroe <june@causal.agency>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by