Merge pull request #715 from Bhasmithal/master

Moved the .gitignore file to a more appropriate place
2015-10-21 00:07:58 -07:00 · 2015-10-21 00:07:58 -07:00 · 10714ef042
commit 10714ef042
parent 8cf538169c 83aa8ca555
2 changed files with 1 additions and 1 deletions
--- a/proto/.gitignore
+++ b/proto/.gitignore
@ -0,0 +1 @@
+src/main/java/com/google/gson/protobuf/generated/
--- a/proto/src/main/java/com/google/gson/protobuf/generated/.gitignore
+++ b/proto/src/main/java/com/google/gson/protobuf/generated/.gitignore
@ -1 +0,0 @@
-**
				`@ -0,0 +1 @@`
				`src/main/java/com/google/gson/protobuf/generated/`