Projects >> sveditor >>de74282caf6d286cd02f140d7e67bb2ab1a27589

Chunk
Conflicting content 
		
		assertNotNull(file);
		assertEquals(0, markers.size());
<<<<<<< HEAD
		assertEquals(0, CoreReleaseTests.getErrors().size());
		
		LogFactory.removeLogHandle(log);
=======
>>>>>>> dde41c8659b58591deeec04beb7c67f6375cb21a
	}

	public void testResourceVarProjVarRef() throws CoreException {
Solution content 
		
		assertNotNull(file);
		assertEquals(0, markers.size());
	}

	public void testResourceVarProjVarRef() throws CoreException {
File
TestProjectSettingsVarRefs.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
		return markers;
	}

<<<<<<< HEAD
	protected void addFile(String path, boolean is_argfile) {
=======
	protected void addFile(String path) {
		fLog.debug("addFile: " + path);
>>>>>>> dde41c8659b58591deeec04beb7c67f6375cb21a
		synchronized (fCache) {
			fCache.addFile(path, is_argfile);
			fCache.setLastModified(path, getFileSystemProvider().getLastModifiedTime(path), is_argfile);
Solution content 
		return markers;
	}

	protected void addFile(String path, boolean is_argfile) {
		fLog.debug("addFile: " + path);
		synchronized (fCache) {
			fCache.addFile(path, is_argfile);
			fCache.setLastModified(path, getFileSystemProvider().getLastModifiedTime(path), is_argfile);
File
AbstractSVDBIndex.java
Developer's decision
Combination
Kind of conflict
Method invocation
Method signature