Skip to content

Commit f615cff

Browse files
committed
load last task that get save for linux
2 parents c1d3e8c + f9daba4 commit f615cff

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
*.exe
2+
*.txt
23
t
34
m
45
test.c

m.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,13 @@
195195
std::string COMMAND;
196196
std::getline(std::cin, COMMAND);
197197

198+
<<<<<<< HEAD
198199
if ( COMMAND == "ADD" || COMMAND == "add")
199200

200201
{
202+
=======
203+
if ( COMMAND == "ADD" || COMMAND == "Add" ) {
204+
>>>>>>> origin/main
201205
std::string TASKNAME;
202206
std::cout << "WHAT NAME IS THE TASK YOU WANT TO ADD : "<< std::endl;
203207
std::getline(std::cin, TASKNAME);

0 commit comments

Comments
 (0)