Projects >> goobi-production >>dc481181fe554910c2e1074ab4b2097780cc4906

Chunk
Conflicting content
			Helper.setFehlerMeldung("UnvollstaendigeDaten", "granularity.header");
			return "";
		}
<<<<<<< HEAD
		Helper.removeManagedBean("ProzesskopieForm");
		CreateProcessesTask createProcesses = new CreateProcessesTask(prozesskopieForm, course, generateBatches);
=======
		CreateNewspaperProcessesTask createProcesses = new CreateNewspaperProcessesTask(prozesskopieForm, course, generateBatches);
>>>>>>> f4866b961a18d1efd68ac1dbd63194f6eb5eb3aa
		TaskManager.addTask(createProcesses);
		return "taskmanager";
	}
Solution content
			Helper.setFehlerMeldung("UnvollstaendigeDaten", "granularity.header");
			return "";
		}
		Helper.removeManagedBean("ProzesskopieForm");
		CreateNewspaperProcessesTask createProcesses = new CreateNewspaperProcessesTask(prozesskopieForm, course, generateBatches);
		TaskManager.addTask(createProcesses);
		return "taskmanager";
	}
File
GranularityForm.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable