Projects >> jgralab >>d1a767cb2d966f651be48494073a2e33ec326db6

Chunk
Conflicting content 
package de.uni_koblenz.jgralab.greql2.funlib;

<<<<<<< HEAD
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
=======
>>>>>>> 6cae658fe8b75d9ae790f74bb9d056ca05e5256e
import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Solution content 
package de.uni_koblenz.jgralab.greql2.funlib;

import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
File
FunLib.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
<<<<<<< HEAD
import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
=======
>>>>>>> 6cae658fe8b75d9ae790f74bb9d056ca05e5256e
import java.util.logging.Logger;

import de.uni_koblenz.jgralab.Graph;
Solution content 
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;

import de.uni_koblenz.jgralab.Graph;
File
FunLib.java
Developer's decision
Version 2
Kind of conflict
Import