diff options
| author | Nicole Vreden <damba@mecka.net> | 2010-02-12 23:05:01 +0100 |
|---|---|---|
| committer | Nicole Vreden <damba@mecka.net> | 2010-02-12 23:05:01 +0100 |
| commit | 5a0d4895d0da4d2726a3f6005f916050319cc394 (patch) | |
| tree | bf515be867337fb4d09b11c8541b4cb98c537495 | |
| parent | 8be46adff153827be946f6c82f634cdac736f8c1 (diff) | |
PGSQLAuth: resolve merge conflict
Signed-off-by: Nicole Vreden <damba@mecka.net>
| -rw-r--r-- | src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java index 1bc4b45..d497c3d 100644 --- a/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java +++ b/src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java @@ -1,38 +1,3 @@ -<<<<<<< HEAD -/*
- * 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);
- }
-}
-======= /* * Copyright (c) 2006 Manuel Traut and Volker Dahnke * All rights reserved. This program and the accompanying materials @@ -66,4 +31,3 @@ public class YalpPGSqlAuth { PGSqlAuth auth = new PGSqlAuth(args); } } ->>>>>>> b794b9e... startup: cleanup startup scripts |