diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java index 1668684..1bc4b45 100644 --- a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java +++ b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java @@ -1,3 +1,4 @@ +<<<<<<< HEAD /*
* Copyright (c) 2006 Manuel Traut and Volker Dahnke
* All rights reserved. This program and the accompanying materials
@@ -31,3 +32,38 @@ public class YalpPGSqlAuth { PGSqlAuth auth = new PGSqlAuth(args);
}
}
+======= +/* + * Copyright (c) 2006 Manuel Traut and Volker Dahnke + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: Manuel Traut and Volker Dahnke + */ +package YalpAuth.YalpPGSqlAuth; + +import YalpInterfaces.*; + +/* + * Class YalpPGSqlAuth + * + * <em>Implements functionality of the DBConnectionInterface</em> + * + * @author Volker Dahnke / Manuel Traut + * + * @version 1 02-04-2006<br> + */ + +public class YalpPGSqlAuth { + private YalpAuthPluginImpl con; + private DatabaseDefines config; + + public static void main(String[] args) + { + System.out.println("YalpPGSqlAuth\n"); + PGSqlAuth auth = new PGSqlAuth(args); + } +} +>>>>>>> b794b9e... startup: cleanup startup scripts |