Projects >> Wildbook >>d0d96224eeda32b27a731b2f4d170329f1b49b96

Chunk
Conflicting content 
    if(pmfs==null){pmfs=new TreeMap();}
    
    try {
<<<<<<< HEAD
      if (!pmfs.containsKey(context)) {
=======
      if ((!pmfs.containsKey(context))||(pmfs.get(context).isClosed())) {
>>>>>>> 16c8e45bbb5614d9f457057a7e2896ab0bfd8f94

        Properties dnProperties = new Properties();
Solution content 
    if(pmfs==null){pmfs=new TreeMap();}
    
    try {
      if ((!pmfs.containsKey(context))||(pmfs.get(context).isClosed())) {

        Properties dnProperties = new Properties();
File
ShepherdPMF.java
Developer's decision
Version 2
Kind of conflict
If statement