diff options
| author | Simo Sorce <idra@samba.org> | 2004-01-22 10:57:16 +0000 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2004-01-22 10:57:16 +0000 |
| commit | 614d1e31175de7a2defd7002722af8cd43bee701 (patch) | |
| tree | 6664de0effa3aa59c3d4ce04098ddce7f0cc91c8 /source3/passdb/pdb_gums.c | |
| parent | 77f2465c10db5688a361409a75a20a75bd2e9c51 (diff) | |
| download | samba-614d1e31175de7a2defd7002722af8cd43bee701.tar.gz samba-614d1e31175de7a2defd7002722af8cd43bee701.tar.bz2 samba-614d1e31175de7a2defd7002722af8cd43bee701.zip | |
sorry for the conflict markers committed in by mistake :-(
(This used to be commit c5634e0b713e594a32522df7a76c36639f772ed5)
Diffstat (limited to 'source3/passdb/pdb_gums.c')
| -rw-r--r-- | source3/passdb/pdb_gums.c | 8 |
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 |