Home Explore Help
Sign In
n4u
/
mad
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix bui;d

Namdak Tonpa 6 years ago
parent
7d474b5997
commit
816513cd44
2 changed files with 1 additions and 5 deletions
Split View Show Diff Stats
  1. 1 1
      include/mad.hrl
  2. 0 4
      rebar.config

+ 1 - 1
include/mad.hrl
View File 

@@ -1 +1 @@
 
--define(VERSION,"d9f7be").
 
+-define(VERSION,"7d474b").

+ 0 - 4
rebar.config
View File 

@@ -1,8 +1,4 @@
 
 {deps_dir,"deps"}.
 
 {erl_opts, [nowarn_export_all]}.
 
 {deps, [%{ling, ".*", {git, "git://github.com/cloudozer/ling", {tag, "master"}}},
 
-<<<<<<< HEAD
 
         {sh, ".*",   {git, "git://github.com/synrc/sh", []}}]}.
 
-=======
 
-        {sh, ".*",   {git, "git://github.com/synrc/sh", {tag, []}}}]}.
 
->>>>>>> 09245c9bf84a64e3685768ffbb047824dc136857