From f68f1e58889a42d76570357c11ea52f6dae26b8f Mon Sep 17 00:00:00 2001
From: mweaver <mweaver@gorgotron.readytalk.com>
Date: Wed, 22 Apr 2009 11:43:22 -0600
Subject: [PATCH] should be fixed

---
 classpath/java/util/Map.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/classpath/java/util/Map.java b/classpath/java/util/Map.java
index 79867bd267..47edee351e 100644
--- a/classpath/java/util/Map.java
+++ b/classpath/java/util/Map.java
@@ -15,15 +15,9 @@ public interface Map<K, V> {
 
   public int size();
 
-<<<<<<< HEAD:classpath/java/util/Map.java
   public boolean containsKey(Object obj);
 
   public boolean containsValue(Object obj);
-=======
-  public boolean containsKey(Object key);
-
-  public boolean containsValue(Object value);
->>>>>>> af784f4cbc18911e29127bcda8110de9bb56d654:classpath/java/util/Map.java
 
   public V get(Object key);