Projects >> artificer >>edb2890b7ba97255207d41f17e894cf8f4d04b10

Chunk
Conflicting content 
                    if (repository != null) break;
                }
                if (repository==null) throw new RepositoryException("ServiceLoader could not instantiate JCR Repository");
<<<<<<< HEAD
=======
                else {

                }
>>>>>>> 4d8067b7145178f8d8712987d1feb23dd2487ddc
                configureNodeTypes();
            }
        } catch (ParsingException e) {
Solution content 
                    if (repository != null) break;
                }
                if (repository==null) throw new RepositoryException("ServiceLoader could not instantiate JCR Repository");
                configureNodeTypes();
            }
        } catch (ParsingException e) {
File
JCRRepository.java
Developer's decision
Version 1
Kind of conflict
Other