ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-08 14:03:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

should be fixed

Browse Source
This commit is contained in:
mweaver 2009-04-22 11:43:22 -06:00
parent d6fb1e0c7c
commit f68f1e5888
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classpath/java/util/Map.java
View File

@ -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);