From 5d22f339557310e9ffd87499c43c1cdbdbf139b1 Mon Sep 17 00:00:00 2001
From: Atmaram Naik <atmaram.naik@sedintechnologies.com>
Date: Mon, 4 Dec 2023 15:07:14 +0530
Subject: [PATCH 1/5] modified settings

---
 .vscode/settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index aaf46e3..fca32f4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
     "playwright.env": {
-        "BASE_URL": "http://144.24.105.148:8081",
+        "BASE_URL": "http://ec2-54-173-169-41.compute-1.amazonaws.com/todo-api-v3",
         "TESTUSERNAME": "string1",
         "TESTPASSWORD": "string1"
     },

From 50a37416d37a71de73a376878b47cc90e10a18e2 Mon Sep 17 00:00:00 2001
From: abc <abc@example.com>
Date: Mon, 4 Dec 2023 15:09:03 +0530
Subject: [PATCH 2/5] modified test

---
 tests/todo/create.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/todo/create.spec.ts b/tests/todo/create.spec.ts
index 4652be1..6e93977 100644
--- a/tests/todo/create.spec.ts
+++ b/tests/todo/create.spec.ts
@@ -8,3 +8,5 @@ test('creation of todo should work', async ({ authenticatedRequest }) => {
   })
   expect(resp.status()).toBe(201)
 });
+
+// First 

From 635b19d7d3e097c2cb6dac4f0c4485d209a053a6 Mon Sep 17 00:00:00 2001
From: Atmaram Naik <atmaram.naik@sedintechnologies.com>
Date: Mon, 4 Dec 2023 15:20:35 +0530
Subject: [PATCH 3/5] resolve conflicts

---
 .DS_Store                 | Bin 8196 -> 8196 bytes
 tests/todo/create.spec.ts |   3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 796d3791640300b71f5262a9d824842d035fff87..894ca1060e8ef586220248617a4881e693af495d 100644
GIT binary patch
delta 107
zcmZp1XmQw}DiFuWKaYWdfrUYjA)O(Up(Hoo#U&{xKM5$t;k+^S+T*^Xj;Qh}c;yQ+
W41<&Na|?ia7#NrrY;G24<Ocu-p&Zfx

delta 107
zcmZp1XmQw}DiFtzwvB;-frUYjA)O(Up(Hoo#U&{xKM5$tvA!(e^y9vxj;Qh}c;yQ+
W41<&Na|?ia7#J8GHa812@&f=mG93^A

diff --git a/tests/todo/create.spec.ts b/tests/todo/create.spec.ts
index 6e93977..abfb103 100644
--- a/tests/todo/create.spec.ts
+++ b/tests/todo/create.spec.ts
@@ -8,5 +8,4 @@ test('creation of todo should work', async ({ authenticatedRequest }) => {
   })
   expect(resp.status()).toBe(201)
 });
-
-// First 
+//First - This change is not going to create conflict

From 37288e82d00446e04ac181778b3d85e28823ff63 Mon Sep 17 00:00:00 2001
From: "prasanth.m@sedintechnologies.com" <prasanth.m@sedintechnologies.com>
Date: Mon, 4 Dec 2023 15:47:24 +0530
Subject: [PATCH 4/5] new file creation

---
 tests/todo/create1.spec.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/todo/create1.spec.ts

diff --git a/tests/todo/create1.spec.ts b/tests/todo/create1.spec.ts
new file mode 100644
index 0000000..e69de29

From 54f888bbc03d51e97d443f842fbbc67aaea94344 Mon Sep 17 00:00:00 2001
From: "prasanth.m@sedintechnologies.com" <prasanth.m@sedintechnologies.com>
Date: Mon, 4 Dec 2023 16:02:26 +0530
Subject: [PATCH 5/5] New commit after rejection

---
 tests/todo/create1.spec.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/todo/create1.spec.ts b/tests/todo/create1.spec.ts
index e69de29..11789f0 100644
--- a/tests/todo/create1.spec.ts
+++ b/tests/todo/create1.spec.ts
@@ -0,0 +1,11 @@
+import {  expect } from '@playwright/test';
+import { login } from '../../testdata/user';
+import { test } from '../../fixture/user.fixture'
+import { TODO_RESOURCE } from '../../config';
+test('creation of todo should work', async ({ authenticatedRequest }) => {
+  const resp = await authenticatedRequest.post(TODO_RESOURCE,{
+    title:'Bring Milk'
+  })
+  expect(resp.status()).toBe(201)
+});
+//New file created
\ No newline at end of file