update API to add subarray sort

6f874ce0 · KIRAN CHANDRAKANT DAPKAR · efdecbe2 · 6f874ce0
Commit 6f874ce0 authored Aug 26, 2018 by KIRAN CHANDRAKANT DAPKAR
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

sorting.h sorting.h +5 -1

No files found.
--- a/sorting.h
+++ b/sorting.h
 #include<vector>
 using namespace std;
+<<<<<<< HEAD
 vector<int> sort_custom(vector<int>, int startidx, int endidx);
+=======
+vector<int> sort_custom(vector<int>, int startidx, int endidx);
+>>>>>>> c547aff3d29229b8b3ed3f62f05c709cbe8d2514