| commit | ab494bc29dd84c46c6630682e2a0051401a39e9b | [log] [tgz] |
|---|---|---|
| author | James E. King III <jking@apache.org> | Sun Dec 30 11:09:34 2018 -0500 |
| committer | James E. King III <jking@apache.org> | Sun Dec 30 11:09:34 2018 -0500 |
| tree | 03566079bd3cd4697a295a11b1a9a3c9652b31c1 | |
| parent | c3375d9e434b5740808813138b28b70517e82c7d [diff] |
fix top level bower.json file - bad merge from release branch
diff --git a/bower.json b/bower.json index ff70611..436a2cf 100644 --- a/bower.json +++ b/bower.json
@@ -1,11 +1,7 @@ { "name": "thrift", -<<<<<<< HEAD + "version": "1.0.0", "homepage": "https://github.com/apache/thrift.git", -======= - "version": "0.12.0", - "homepage": "https://git-wip-us.apache.org/repos/asf/thrift.git", ->>>>>>> origin/0.12.0 "authors": [ "Apache Thrift <dev@thrift.apache.org>" ],