Skip to content

Commit 4b865b2

Browse files
committed
merge commit
2 parents 848dca1 + 53f1fff commit 4b865b2

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

1. Calculator/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ body{
6363

6464
}
6565
#add{
66-
color: aqua;
66+
color: aqua;
6767

6868
}
6969
#sub{

11. Toast Notification/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
<<<<<<< HEAD
12
# Stopwatch _(HTML, CSS, and Js)_
23
![alt text](https://github.com/AkashKobal/web-development/blob/main/10.%20Stopwatch/output.png)
4+
=======
5+
# Toast Notifications _(HTML, CSS, and Js)_
6+
![alt text](https://github.com/AkashKobal/web-development/blob/main/11.%20Toast%20Notification/output.png)
7+
>>>>>>> 53f1fffa0316e97431a1af82b2a8f198a8f89855

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Web Development Projects (Beginner to Advance)
1+
# Web Development Projects (Beginner to Advance)
22
## Calculator _(HTML and CSS)_ <br>
33
![alt text](https://github.com/AkashKobal/web-development/blob/main/1.%20Calculator/calculator%20output.png)
44

@@ -36,7 +36,12 @@
3636
## Stopwatch _(HTML, CSS, and Js)_
3737
![alt text](https://github.com/AkashKobal/web-development/blob/main/10.%20Stopwatch/output.png)
3838

39+
<<<<<<< HEAD
3940
## Email Subscription _(HTML, CSS, and Js)_
4041
![alt text](https://github.com/AkashKobal/web-development/blob/main/10.%20Email%20Subscription/output.png)
42+
=======
43+
## Toast Notifications _(HTML, CSS, and Js)_
44+
![alt text](https://github.com/AkashKobal/web-development/blob/main/11.%20Toast%20Notification/output.png)
45+
>>>>>>> 53f1fffa0316e97431a1af82b2a8f198a8f89855
4146
4247

0 commit comments

Comments
 (0)