From 69e83e80c009744055a57db62783d61346d88725 Mon Sep 17 00:00:00 2001 From: Fenn Date: Sat, 5 Jul 2014 09:24:55 +0100 Subject: [PATCH] Why is this file here... :< --- 01vbub31.wol.txt | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 01vbub31.wol.txt diff --git a/01vbub31.wol.txt b/01vbub31.wol.txt deleted file mode 100644 index f3d6922f..00000000 --- a/01vbub31.wol.txt +++ /dev/null @@ -1,34 +0,0 @@ -Merge remote-tracking branch 'origin/master' - -Conflicts: - src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java -# -# It looks like you may be committing a merge. -# If this is not correct, please remove the file -# .git/MERGE_HEAD -# and try again. - - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# On branch master -# Your branch and 'origin/master' have diverged, -# and have 1 and 7 different commits each, respectively. -# (use "git pull" to merge the remote branch into yours) -# -# All conflicts fixed but you are still merging. -# (use "git commit" to conclude merge) -# -# Changes to be committed: -# -# modified: README.md -# modified: build.gradle -# modified: src/main/java/info/jbcs/minecraft/chisel/Chisel.java -# modified: src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java -# modified: src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java -# modified: src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java -# new file: src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java -# new file: src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java -# modified: src/main/resources/assets/chisel/lang/en_US.lang -# -