From 5a0d4895d0da4d2726a3f6005f916050319cc394 Mon Sep 17 00:00:00 2001 From: Nicole Vreden Date: Fri, 12 Feb 2010 23:05:01 +0100 Subject: PGSQLAuth: resolve merge conflict Signed-off-by: Nicole Vreden --- src/YalpAuth/YalpPGSqlAuth/YalpPGSqlAuth.java | 36 --------------------------- 1 file changed, 36 deletions(-) (limited to 'src/YalpAuth') 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 - * - * Implements functionality of the DBConnectionInterface - * - * @author Volker Dahnke / Manuel Traut - * - * @version 1 02-04-2006
- */ - -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 -- cgit v1.2.3