Permalink
Browse files

Msd`erge https://github.com/Remziukas/aritmetika

Conflicts:
	main.cpp
  • Loading branch information...
2 parents 6d8d2a0 + 91ad8d3 commit 67de308ae5b7106b5987334822deeecb2af1342c @br1ck committed Oct 4, 2012
Showing with 6 additions and 0 deletions.
  1. +6 −0 main.cpp
View
@@ -6,8 +6,14 @@ int sudetis(int x, int y){
}
int main (int argc, char const *argv[])
{
+<<<<<<< HEAD
int x = 15, y = 25;
cout << "Sveika aritmetika!";
+=======
+ int x = 99, y = 500;
+ cout << "Sveika aritmetika!";
+ cout << "Bet kąąąąąąąąą!";
+>>>>>>> 91ad8d399d2c02c899e6b6b487ca11947639d437
cout << "x + y = " << sudetis(x,y);
return 0;
}

0 comments on commit 67de308

Please sign in to comment.