Mineplex2018-withcommit/org.eclipse.jdt.ui.prefs at 0c85e5d199ed6442821bf379740c791466818319 - Mineplex2018-withcommit - SigmaGaming

JarvisBigBalls/Mineplex2018-withcommit

Morten 2ef32a14df Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex

# Conflicts:
#	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
#	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java

2015-11-10 17:15:23 +01:00

7 lines

156 B

INI

Raw Blame History

 eclipse.preferences.version=1
 <<<<<<< HEAD
 formatter_profile=_Morten
 =======
 >>>>>>> 6983af944fff04c5910f789266ae46b9eca4cc8d
 formatter_settings_version=12