Projects >> Wildbook >>aaca15002ac397d4dc36d16f870a64e071ddc30b

Chunk
Conflicting content 
    Query query=getPM().newQuery(filter);
    Collection c = (Collection) (query.execute());
    Iterator it = c.iterator();
<<<<<<< HEAD
    
=======

>>>>>>> 057edd4b2407703d74daaa2508bcdd7380c2727a
    while(it.hasNext()){
      Occurrence occur=(Occurrence)it.next();
      query.closeAll();
Solution content 
    Query query=getPM().newQuery(filter);
    Collection c = (Collection) (query.execute());
    Iterator it = c.iterator();
    
    while(it.hasNext()){
      Occurrence occur=(Occurrence)it.next();
      query.closeAll();
File
Shepherd.java
Developer's decision
Version 1
Kind of conflict
Blank