summaryrefslogtreecommitdiff
path: root/conflictcheck.c
diff options
context:
space:
mode:
Diffstat (limited to 'conflictcheck.c')
-rw-r--r--conflictcheck.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/conflictcheck.c b/conflictcheck.c
index cd3f3a9..37b6c45 100644
--- a/conflictcheck.c
+++ b/conflictcheck.c
@@ -1,4 +1,4 @@
-/*
+/* -*- c++ -*-
Copyright (C) 2004-2011 Christian Wieninger
This program is free software; you can redistribute it and/or