Merge pull request google#715 from Bhasmithal/master

Moved the .gitignore file to a more appropriate place
hn5092 · Oct 21, 2015 · 10714ef · 10714ef
2 parents 8cf5381 + 83aa8ca
commit 10714ef
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/proto/.gitignore b/proto/.gitignore
@@ -0,0 +1 @@
+src/main/java/com/google/gson/protobuf/generated/
diff --git a/proto/src/main/java/com/google/gson/protobuf/generated/.gitignore b/proto/src/main/java/com/google/gson/protobuf/generated/.gitignore
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		src/main/java/com/google/gson/protobuf/generated/