# Conflicts: # tools/lammps-gui/CMakeLists.txt # tools/lammps-gui/lammpsgui.cpp # tools/lammps-gui/lammpsgui.qrc # tools/lammps-gui/lammpsgui.ui