[erlang] remove rebar.lock and update .gitignore

2016-11-19 13:13:42 -05:00
parent 88cff80690
commit 5545b1c4f2
2 changed files with 5 additions and 1 deletions
@@ -78,3 +78,7 @@ android/project/obj
 android/project/jni/fwknop/fko.h
 android/project/jni/libfwknop/*.h
 android/project/jni/libfwknop/*.c
+
+# Erlang
+erlang/_build
+erlang/rebar.lock
@@ -1,5 +1,5 @@
 {erl_opts, [debug_info]}.
 {deps,	[
-	{pkcs7, {git, "https://github.com/camshaft/pkcs7.erl"}}
+	{pkcs7, {git, "https://github.com/camshaft/pkcs7.erl"}, {branch, "master"}}
 	]
 }.