From 936f1f064115f94425c521a5c94f0957f67a480d Mon Sep 17 00:00:00 2001
From: Andreas Tobler <andreast@gcc.gnu.org>
Date: Tue, 21 Sep 2004 13:25:26 +0200
Subject: [multiple changes]

2004-09-21  Andreas Tobler  <a.tobler@schweiz.ch>

	* javax/security/auth/x500/X500Principal.java: Fix some merge glitches.

2004-09-21  Michael Koch  <konqueror@gmx.de>

	* javax/net/ssl/SSLServerSocket.java:
	Removed comment about "Do not edit this file, it's generated.".

From-SVN: r87800
---
 libjava/javax/net/ssl/SSLServerSocket.java | 1 -
 1 file changed, 1 deletion(-)

(limited to 'libjava/javax/net')

diff --git a/libjava/javax/net/ssl/SSLServerSocket.java b/libjava/javax/net/ssl/SSLServerSocket.java
index eab92a2..fee99f4 100644
--- a/libjava/javax/net/ssl/SSLServerSocket.java
+++ b/libjava/javax/net/ssl/SSLServerSocket.java
@@ -1,4 +1,3 @@
-// THIS IS A GENERATED FILE. DO NOT EDIT. -*- buffer-read-only: t -*-
 /* SSLServerSocket.java -- a server socket for SSL connections.
    Copyright (C) 2004 Free Software Foundation, Inc.
 
-- 
cgit v1.1