From 5545b1c4f2eaa2e0961f306c2d03ddf509247513 Mon Sep 17 00:00:00 2001
From: Michael Stair <ms1784@att.com>
Date: Sat, 19 Nov 2016 13:13:42 -0500
Subject: [PATCH] [erlang] remove rebar.lock and update .gitignore

---
 .gitignore          | 4 ++++
 erlang/rebar.config | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 45f5711d..dda59d1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/erlang/rebar.config b/erlang/rebar.config
index b22e2496..5f8ef718 100644
--- a/erlang/rebar.config
+++ b/erlang/rebar.config
@@ -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"}}
 	]
 }.