Fixed bad merge rebar config.

rebar.config

@@ -10,31 +10,18 @@
 {edoc_opts, [{dir, "../../doc"}]}.
 {deps,
  [
-<<<<<<< HEAD
   {lager, ".*", {git, "git://github.com/basho/lager.git", {tag, "1.2.2"}}},
-=======
-  {lager, ".*", {git, "git://github.com/basho/lager.git", {tag, "1.2.1"}}},
   {newrelic, ".*", {git, "https://github.com/wooga/newrelic-erlang.git", {tag, "master"}}},
->>>>>>> test
   {jsx, ".*", {git, "http://github.com/talentdeficit/jsx.git", {tag, "v1.3.3"}}},
   {mimetypes, ".*", {git, "http://github.com/spawngrid/mimetypes.git", {tag, "1.0"}}},
   {cowboy, ".*", {git, "https://github.com/extend/cowboy.git", {tag, "0.8.3"}}},
-  {eplugin, ".*", {git, "http://github.com/Licenser/eplugin.git", {branch, master}}},
+  {eplugin, ".*", {git, "http://github.com/Licenser/eplugin.git", {tag, "0.1.1"}}},
+  {statman, ".*", {git, "https://github.com/Licenser/statman.git", {tag, "master"}}},
   {msgpack, ".*", {git, "git://github.com/msgpack/msgpack-erlang.git", {tag, "0.1.2"}}},
-<<<<<<< HEAD
   {jsxd, ".*", {git, "https://github.com/Licenser/jsxd.git", {tag, "0.1.6"}}},
-  {libhowl, ".*", {git, "http://github.com/project-fifo/libhowl.git", {tag, "0.1.6"}}},
-  {fifo_spec, ".*", {git, "https://github.com/project-fifo/fifo_spec.git", {tag, "0.1.1"}}},
-  {libchunter, ".*", {git, "http://github.com/project-fifo/libchunter.git", {tag, "0.1.8"}}},
-  {libsniffle, ".*", {git, "http://github.com/project-fifo/libsniffle.git", {tag, "0.2.5"}}},
-  {libsnarl, ".*", {git, "http://github.com/project-fifo/libsnarl.git", {tag, "0.2.5"}}}
-=======
-  {statman, ".*", {git, "https://github.com/Licenser/statman.git", {tag, "master"}}},
-  {jsxd, ".*", {git, "https://github.com/Licenser/jsxd.git", {branch, master}}},
-  {libhowl, ".*", {git, "http://github.com/project-fifo/libhowl.git", {branch, test}}},
-  {fifo_spec, ".*", {git, "https://github.com/project-fifo/fifo_spec.git", {branch, test}}},
-  {libchunter, ".*", {git, "http://github.com/project-fifo/libchunter.git", {branch, test}}},
-  {libsniffle, ".*", {git, "http://github.com/project-fifo/libsniffle.git", {branch, test}}},
-  {libsnarl, ".*", {git, "http://github.com/project-fifo/libsnarl.git", {branch, test}}}
->>>>>>> test
+  {fifo_spec, ".*", {git, "https://github.com/project-fifo/fifo_spec.git", {tag, "0.1.2"}}},
+  {libchunter, ".*", {git, "http://github.com/project-fifo/libchunter.git", {tag, "0.1.9"}}},
+  {libhowl, ".*", {git, "http://github.com/project-fifo/libhowl.git", {tag, "0.1.11"}}},
+  {libsniffle, ".*", {git, "http://github.com/project-fifo/libsniffle.git", {tag, "0.2.13"}}},
+  {libsnarl, ".*", {git, "http://github.com/project-fifo/libsnarl.git", {tag, "0.2.11"}}}
  ]}.