[Webfunds-commits] java init_java

Ian Grigg iang@cypherpunks.ai
Fri, 9 Feb 2001 15:37:49 -0400 (AST)


iang        01/02/09 15:37:49

  Modified:    .        init_java
  Log:
  fixed conflict

Revision  Changes    Path
1.8       +1 -1      java/init_java

Index: init_java
===================================================================
RCS file: /home/webfunds/cvsroot/java/init_java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- init_java	2001/02/01 22:40:32	1.7
+++ init_java	2001/02/09 19:37:48	1.8
@@ -20,7 +20,7 @@
 #
 #     This file will get overwritten by new versions.
 #
-jdks="X_/usr/local/linux-jdk1.2.2 /usr/local/jdk/jdk1.1.8 /usr/local/jdk1.1.8"
+jdks="/usr/local/linux-jdk1.2.2 /usr/local/jdk/jdk1.1.8 /usr/local/jdk1.1.8"
 
 swings="\
         /usr/local/share/java/classes/jfc-1.1.1/swingall.jar \