From 75b5b8d41e82f7f625b055589048aee7beec1f32 Mon Sep 17 00:00:00 2001
From: Karthic Rao <kartronics85@yahoo.com>
Date: Fri, 12 Feb 2016 09:29:09 +0530
Subject: [PATCH] removing trailing whitespace

---
 tools/merge/merge.cc      | 5 ++---
 tools/merge/merge_heap.cc | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/tools/merge/merge.cc b/tools/merge/merge.cc
index 013ea816..d2e2a5be 100644
--- a/tools/merge/merge.cc
+++ b/tools/merge/merge.cc
@@ -15,9 +15,9 @@
  *
  *  compile : g++ merge.cc <path_to_rocksDB_installation>/librocksdb.so.4.1 --std=c++11 -lstdc++fs
  *  usage : ./<executable> <folder_having_rocksDB_directories_to_be_merged> <destination_folder>
- *  
+ *
  *  find the rocksdb headers here https://github.com/facebook/rocksdb/tree/master/include/rocksdb
- *           
+ *
  */
 
 #include <fstream>
@@ -26,7 +26,6 @@
 #include <string>
 #include "rocksdb/db.h"
 #include "rocksdb/options.h"
-
 #include <experimental/filesystem>
 
 using namespace rocksdb;
diff --git a/tools/merge/merge_heap.cc b/tools/merge/merge_heap.cc
index d0a0b813..34e755d5 100644
--- a/tools/merge/merge_heap.cc
+++ b/tools/merge/merge_heap.cc
@@ -12,12 +12,12 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *  
+ *
  *  compile : g++ merge_heap.cc <path_to_rocksDB_installation>/librocksdb.so.4.1 --std=c++11 -lstdc++fs
  *  usage : ./<executable> <folder_having_rocksDB_directories_to_be_merged> <destination_folder>
- * 
- *  rocksdb headers can be found here https://github.com/facebook/rocksdb/tree/master/include/rocksdb  
- */ 
+ *
+ *  rocksdb headers can be found here https://github.com/facebook/rocksdb/tree/master/include/rocksdb
+ */
 
 #include <fstream>
 #include <cstdio>
@@ -27,7 +27,6 @@
 #include <vector>
 #include "rocksdb/db.h"
 #include "rocksdb/options.h"
-
 #include <experimental/filesystem>
 
 using namespace rocksdb;
-- 
GitLab