# Conflicts:
#	src/VirtualFluids_GPU/Calculation/CalcMedian.h
#	src/VirtualFluids_GPU/Calculation/ForceCalculations.cpp
#	src/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
#	src/VirtualFluids_GPU/Calculation/UpdateGrid27.h
#	src/VirtualFluids_GPU/DataStructureInitializer/GridProvider.cpp
#	src/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
#	src/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp
#	src/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
#	src/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
#	src/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp
#	src/VirtualFluids_GPU/GPU/Cumulant27.cu
#	src/VirtualFluids_GPU/GPU/GPU_Interface.h
#	src/VirtualFluids_GPU/GPU/GPU_Kernels.cuh
#	src/VirtualFluids_GPU/GPU/Init27.cu
#	src/VirtualFluids_GPU/GPU/LBMKernel.cu
#	src/VirtualFluids_GPU/GPU/WaleCumulant27.cu
#	src/VirtualFluids_GPU/Init/InitLattice.cpp
#	src/VirtualFluids_GPU/Kernel/Advection/Compressible/CumulantAA2016/CumulantAA2016CompSP27.h
#	src/VirtualFluids_GPU/Kernel/Advection/Compressible/CumulantAll4/CumulantAll4CompSP27.h
#	src/VirtualFluids_GPU/Kernel/Advection/Compressible/CumulantF3/CumulantF3CompSP27.h
#	src/VirtualFluids_GPU/Kernel/Advection/Compressible/CumulantF32018/CumulantF32018CompSP27.h
#	src/VirtualFluids_GPU/Kernel/Advection/Compressible/CumulantOne/CumulantOneCompSP27.h
#	src/VirtualFluids_GPU/LBM/Simulation.cpp
#	src/VirtualFluids_GPU/LBM/Simulation.h
#	src/VirtualFluids_GPU/Output/DataWriter.h
#	src/VirtualFluids_GPU/Output/WriteData.cpp
#	src/VirtualFluids_GPU/Output/WriteData.h
#	src/VirtualFluids_GPU/Parameter/Parameter.cpp
#	src/VirtualFluids_GPU/Parameter/Parameter.h
#	targets/apps/HULC/main.cpp
#	targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp
#	targets/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.h
#	targets/tests/NumericalTests/Utilities/GridReaderforTesting/gridReaderforTesting.cpp
#	targets/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameterImp.cpp
#	targets/tests/NumericalTests/Utilities/SimulationParameter/SimulationParameterImp.h
#	targets/tests/NumericalTests/main.cpp

# Conflicts:
#	src/VirtualFluids_GPU/LBM/Simulation.cpp
#	targets/apps/LBM/Basel/main.cpp

# Conflicts:
#	src/GridGenerator/StreetPointFinder/JunctionReader.cpp
#	src/VirtualFluids_GPU/LBM/Simulation.cpp

# Conflicts:
#	targets/apps/LBM/Basel/main.cpp