Projects >> Entity-System-RDBMS-Beta--Java- >>c6013a9817d6e40756893b364aaf3f1fb66b8b15

Chunk
Conflicting content 
		if( defaultEntityManager == null )
			throw new IllegalArgumentException( "There is no global EntityManager; create a new EntityManager before creating Entity's" );
		
<<<<<<< HEAD
		parentEntityManager = defaultEntityManager; 
		
=======
		parentEntityManager = defaultEntityManager;
>>>>>>> 72c5dc6074bd8f8547d55426cf90210d8fbd3d3d
		entity = defaultEntityManager.createEntity();	
	}
Solution content 
		if( defaultEntityManager == null )
			throw new IllegalArgumentException( "There is no global EntityManager; create a new EntityManager before creating Entity's" );
		
		parentEntityManager = defaultEntityManager; 
		
		entity = defaultEntityManager.createEntity();	
	}
File
MetaEntity.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
			throw new IllegalArgumentException( "There is no global EntityManager; create a new EntityManager before creating Entity's" );
		
		parentEntityManager = defaultEntityManager;
<<<<<<< HEAD
		
=======
>>>>>>> 72c5dc6074bd8f8547d55426cf90210d8fbd3d3d
		entity = e;	
	}
Solution content 
			throw new IllegalArgumentException( "There is no global EntityManager; create a new EntityManager before creating Entity's" );
		
		parentEntityManager = defaultEntityManager;
		
		entity = e;	
	}
File
MetaEntity.java
Developer's decision
Version 1
Kind of conflict
Blank