From 7194d0cf1af9fc074e8cbee00b2a61410655ca80 Mon Sep 17 00:00:00 2001 From: Mukesh Date: Tue, 5 Oct 2021 20:11:26 +0530 Subject: [PATCH 1/4] Comments added in README.md and __init__.py files --- README.md | 1 + win10toast/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ca7a27e..bff0314 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![made-with-python](https://img.shields.io/badge/Made%20with-Python-1f425f.svg)](https://www.python.org/) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fjithurjacob%2FWindows-10-Toast-Notifications.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fjithurjacob%2FWindows-10-Toast-Notifications?ref=badge_shield) [![HitCount](http://hits.dwyl.io/jithurjacob/Windows-10-Toast-Notifications.svg)](http://hits.dwyl.io/jithurjacob/Windows-10-Toast-Notifications) [![MIT license](https://img.shields.io/badge/License-MIT-blue.svg)](https://lbesson.mit-license.org/) An easy-to-use Python library for displaying Windows 10 Toast Notifications which is useful for Windows GUI development. +Changing readme file for completing git assignment!! ![o7ja4 1](https://cloud.githubusercontent.com/assets/7101452/19763806/75f71ba4-9c5d-11e6-9f16-d0d4bf43e63e.png) diff --git a/win10toast/__init__.py b/win10toast/__init__.py index 8ed1bc5..aa121f1 100644 --- a/win10toast/__init__.py +++ b/win10toast/__init__.py @@ -45,8 +45,8 @@ from win32gui import WNDCLASS # ############################################################################ -# ########### Classes ############## -# ################################## +# ########### Classes ############## Adding changes +# #################################################################### class ToastNotifier(object): From 6e94e43f13c9d9faf247ccc98ebe78df4d7941ba Mon Sep 17 00:00:00 2001 From: Manju Latha Date: Thu, 7 Oct 2021 22:48:40 +0530 Subject: [PATCH 2/4] change README.md file --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index bff0314..bcefc77 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ Changing readme file for completing git assignment!! ![o7ja4 1](https://cloud.githubusercontent.com/assets/7101452/19763806/75f71ba4-9c5d-11e6-9f16-d0d4bf43e63e.png) -## Installation +## Installation, Performing merge conflict activity, +## Assigment Done by Manju Latha ``` pip install win10toast From 047ddb0811d14571d15f280f30057858884866ff Mon Sep 17 00:00:00 2001 From: Aarushi Gupta Date: Fri, 8 Oct 2021 00:36:59 +0530 Subject: [PATCH 3/4] changes done by Aarushi --- README.md | 3 ++- win10toast/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bff0314..bbe534d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ Changing readme file for completing git assignment!! ![o7ja4 1](https://cloud.githubusercontent.com/assets/7101452/19763806/75f71ba4-9c5d-11e6-9f16-d0d4bf43e63e.png) -## Installation +## Installation Performing merge conflict activity +## Assignment done by Aarushi ``` pip install win10toast diff --git a/win10toast/__init__.py b/win10toast/__init__.py index aa121f1..37a2716 100644 --- a/win10toast/__init__.py +++ b/win10toast/__init__.py @@ -45,8 +45,8 @@ from win32gui import WNDCLASS # ############################################################################ -# ########### Classes ############## Adding changes -# #################################################################### +# ########### Classes ############## Adding changes by Aarushi +# ################################################################### class ToastNotifier(object): From c67433a68a3d7db476306326772940fef64d73b7 Mon Sep 17 00:00:00 2001 From: Srinivas Date: Fri, 8 Oct 2021 20:28:24 +0530 Subject: [PATCH 4/4] Comments added by Lavanya-2021Ht66032 --- README.md | 3 ++- win10toast/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bff0314..5617b3d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ Changing readme file for completing git assignment!! ![o7ja4 1](https://cloud.githubusercontent.com/assets/7101452/19763806/75f71ba4-9c5d-11e6-9f16-d0d4bf43e63e.png) -## Installation +## Installation Lavanya Git merge and conflict changes +## 2021HT66032- Lavanya S ``` pip install win10toast diff --git a/win10toast/__init__.py b/win10toast/__init__.py index aa121f1..02ea68b 100644 --- a/win10toast/__init__.py +++ b/win10toast/__init__.py @@ -45,9 +45,9 @@ from win32gui import WNDCLASS # ############################################################################ -# ########### Classes ############## Adding changes +# ########### Class ToastNotifier############## # #################################################################### - +#Add comments on new line class ToastNotifier(object): """Create a Windows 10 toast notification.