diff options
| author | James E. King III <jking@apache.org> | 2018-12-30 11:09:34 -0500 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2018-12-30 11:09:34 -0500 |
| commit | ab494bc29dd84c46c6630682e2a0051401a39e9b (patch) | |
| tree | 03566079bd3cd4697a295a11b1a9a3c9652b31c1 /bower.json | |
| parent | c3375d9e434b5740808813138b28b70517e82c7d (diff) | |
| download | thrift-ab494bc29dd84c46c6630682e2a0051401a39e9b.tar.gz | |
fix top level bower.json file - bad merge from release branch
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bower.json b/bower.json index ff70611b7..436a2cf35 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>" ], |