From ab494bc29dd84c46c6630682e2a0051401a39e9b Mon Sep 17 00:00:00 2001
From: "James E. King III" <jking@apache.org>
Date: Sun, 30 Dec 2018 11:09:34 -0500
Subject: fix top level bower.json file - bad merge from release branch

---
 bower.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'bower.json')

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>"
   ],
-- 
cgit v1.2.1