[armedbear-cvs] r12966 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sat Oct  9 16:58:58 2010
New Revision: 12966

Log:
Repair HashTable.java, broken due to faulty conflict resolution.


Modified:
   trunk/abcl/src/org/armedbear/lisp/HashTable.java

Modified: trunk/abcl/src/org/armedbear/lisp/HashTable.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/HashTable.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/HashTable.java	Sat Oct  9 16:58:58 2010
@@ -50,9 +50,6 @@
     private int mask;
     final Comparator comparator;
 
-  protected HashTable(int size, LispObject rehashSize,
-                      LispObject rehashThreshold)
-  {
     protected HashTable(Comparator c, int size, LispObject rehashSize,
             LispObject rehashThreshold) {
         this.rehashSize = rehashSize;