From 35e89f86fe21eb2a1246357184628595f8edca5d Mon Sep 17 00:00:00 2001
From: Cameron Schermerhorn <cameron.schermerhorn@its.ny.gov>
Date: Fri, 9 Oct 2015 13:31:48 -0400
Subject: [PATCH] Resolve merge conflict with master

+ added name back to contributor list
---
 java.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java.html.markdown b/java.html.markdown
index 58c19f11..3b289a6d 100644
--- a/java.html.markdown
+++ b/java.html.markdown
@@ -6,7 +6,7 @@ contributors:
     - ["Madison Dickson", "http://github.com/mix3d"]
     - ["Simon Morgan", "http://sjm.io/"]
     - ["Zachary Ferguson", "http://github.com/zfergus2"]
-	- ["Cameron Schermerhorn", "http://github.com/cschermerhorn"]
+    - ["Cameron Schermerhorn", "http://github.com/cschermerhorn"]
 filename: LearnJava.java
 ---