Fixed conflicts · 010649f323 - CraftingKeys - Speiger Git

Meduris/CraftingKeys

Fixed conflicts

This commit is contained in:

0xSeb

2015-06-26 18:40:11 +02:00

parent 1a356ec6bf a0d280d55d

commit 010649f323

6 changed files with 19 additions and 20 deletions

									
										src/main/java/de/skate702/craftingkeys/Settings.java
									
		+1
		-2
	
												View File
												
				@@ -2,5 +2,4 @@ package de.skate702.craftingkeys;

				public class Settings {

				}

				}