diff options
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bower.json b/bower.json index 6f3c126a8..ff70611b7 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,11 @@ { "name": "thrift", +<<<<<<< HEAD "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>" ], |