Merge branch 'master' of https://github.com/nirvana/couchie

Conflicts: .gitignore
mykewould · Aug 23, 2014 · 8aa2d50 · 8aa2d50
2 parents 8729549 + 86b705a
commit 8aa2d50
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/mix.exs b/mix.exs
@@ -24,9 +24,9 @@ defmodule Couchie.Mixfile do
   # {:erlmc, "0.1", git: "https://github.com/n1rvana/erlmc.git"}
   defp deps do
     [
-		  {:cberl, github: "clutchanalytics/cberl"}, #chitika is authoritative source
-      {:jazz, github: "devinus/jazz", branch: "0.13"}
-      # {:jazz, github: "meh/jazz"}
+		  {:cberl, github: "chitika/cberl"}, #chitika is authoritative source
+      #{:jazz, github: "devinus/jazz", branch: "0.13"}
+      {:jazz, github: "meh/jazz"}
     ]
   end
 end
diff --git a/mix.lock b/mix.lock
@@ -0,0 +1,4 @@
+%{"cberl": {:git, "git://github.com/chitika/cberl.git", "00c4a4b2b9a7f5054f69303b0be64a5266e8de3a", []},
+  "jazz": {:git, "git://github.com/meh/jazz.git", "e0cf73011f64868534cd229c458e205ce04a6619", []},
+  "jiffy": {:git, "https://github.com/davisp/jiffy.git", "2dbf89f51c547914e994f51457140df9e9a1ca83", [branch: "master"]},
+  "poolboy": {:git, "https://github.com/devinus/poolboy.git", "17d1582533af5c076117e2e1270f4b43faa02f12", [branch: "master"]}}
diff --git a/test/couchie_test.exs b/test/couchie_test.exs
@@ -1,5 +1,3 @@
-Code.require_file "../test_helper.exs", __FILE__
-
 defmodule CouchieTest do
   use ExUnit.Case