summaryrefslogtreecommitdiff
path: root/source3/passdb/pdb_gums.c
diff options
context:
space:
mode:
Diffstat (limited to 'source3/passdb/pdb_gums.c')
-rw-r--r--source3/passdb/pdb_gums.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/source3/passdb/pdb_gums.c b/source3/passdb/pdb_gums.c
index c595a51e55..874199e04d 100644
--- a/source3/passdb/pdb_gums.c
+++ b/source3/passdb/pdb_gums.c
@@ -1,12 +1,6 @@
/*
-<<<<<<< pdb_gums.c
* 'Gums' password backend for samba
- * Copyright (C) Simo Sorce 2003
-=======
- * GUMS password backend for samba
- * Copyright (C) Jelmer Vernooij 2002
- * Copyright (C) Andrew Bartlett 2003
->>>>>>> 1.4
+ * Copyright (C) Simo Sorce 2004
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free