Week2-AmirHossein-Conflicts resolved#7

Open

amirhshad wants to merge 15 commits intosamravan:masterfrom

amirhshad:week2-amirhossein

Commits on Nov 22, 2020

ex1 added
amirhshad
committed
215c676
Copy full SHA for 215c676

Commits on Nov 23, 2020

ex1 modified
amirhshad
committed
e6bc6d4
Copy full SHA for e6bc6d4
ex1 modified
amirhshad
committed
d0d5f99
Copy full SHA for d0d5f99
ex2 is added
amirhshad
committed
433e60e
Copy full SHA for 433e60e
ex3 is added
amirhshad
committed
553fc62
Copy full SHA for 553fc62
ex4 is added
amirhshad
committed
f68507e
Copy full SHA for f68507e
ex5 is added
amirhshad
committed
46c3901
Copy full SHA for 46c3901

Commits on Nov 25, 2020

counter is fixed - timer is added
amirhshad
committed
dde1798
Copy full SHA for dde1798

Commits on Nov 27, 2020

Pomodoro project added - some bugs need to fix
amirhshad
committed
6c75d23
Copy full SHA for 6c75d23
Timer time is fixed
amirhshad
committed
6ba8033
Copy full SHA for 6ba8033

Commits on Nov 28, 2020

Pomodoro project is finished and added
amirhshad
committed
0152fa7
Copy full SHA for 0152fa7

Commits on Nov 30, 2020

index.js modified
amirhshad
committed
8d97c0f
Copy full SHA for 8d97c0f

Commits on Dec 5, 2020

AmirHossein folder added
amirhshad
committed
0dcf918
Copy full SHA for 0dcf918
Ex2 euro sign in added
amirhshad
committed
dbb234e
Copy full SHA for dbb234e
Bugs fixed
amirhshad
committed
5c80060
Copy full SHA for 5c80060