merged master with merge-sort

74f8a471 · KSHITIJ SINGHA · ebe6a3b5 · da949617 · 74f8a471 · 74f8a471
Commit 74f8a471 authored Sep 23, 2018 by KSHITIJ SINGHA
Show whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

Makefile Makefile +4 -0

main.cpp main.cpp +4 -0

main.o main.o +0 -0

sorting.cpp sorting.cpp +1 -0

sorting.h sorting.h +4 -0

sorting.o sorting.o +0 -0

No files found.
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ sorting.o: sorting.cpp
 clean:
 	rm -rf a.out
+<<<<<<< HEAD
 =======
 CC = g++
@@ -28,3 +29,6 @@ sorting.o: sorting.cpp sorting.h
 clean:
 	rm -rf *.o
 >>>>>>> merge-sort
+=======
+>>>>>>> da94961751a78074e353150eec99910db0c9a8fc
--- a/main.cpp
+++ b/main.cpp
@@ -4,7 +4,11 @@
 using namespace std;
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+//from header file
+>>>>>>> da94961751a78074e353150eec99910db0c9a8fc
 vector<int> sort_custom(vector<int>& a);
 void printVector(vector<int> a);

--- a/main.o
+++ b/main.o
--- a/sorting.cpp
+++ b/sorting.cpp
 <<<<<<< HEAD
 #include <vector>
 #include "sorting.h"
+//
 using namespace std;
 vector<int> sort_custom(const vector<int>& a)
 {

--- a/sorting.h
+++ b/sorting.h
 using namespace std;
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+//func 
+>>>>>>> da94961751a78074e353150eec99910db0c9a8fc
 vector<int> sort_custom(vector<int>& a);
 void printVector(vector<int> a);
 =======

--- a/sorting.o
+++ b/sorting.o