Mineplex2018-withcommit/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs

eclipse.preferences.version=1
<<<<<<< HEAD
formatter_profile=_Morten
=======
>>>>>>> 6983af944fff04c5910f789266ae46b9eca4cc8d
formatter_settings_version=12
Added SkyWars ;) 2015-06-21 04:08:15 +02:00			`eclipse.preferences.version=1`
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			`<<<<<<< HEAD`
Minor update ;) 2015-08-22 11:01:37 +02:00			`formatter_profile=_Morten`
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			`=======`
			`>>>>>>> 6983af944fff04c5910f789266ae46b9eca4cc8d`
Added SkyWars ;) 2015-06-21 04:08:15 +02:00			`formatter_settings_version=12`