From 4df23934934ed3d9f6d73dbc43463ec70cad7fb3 Mon Sep 17 00:00:00 2001 From: Muhammad Akbar Date: Wed, 30 Oct 2024 18:28:25 -0700 Subject: [PATCH 1/5] Added my name and profile to contributors --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index aac91b9..fb76c49 100644 --- a/README.md +++ b/README.md @@ -68,13 +68,12 @@ Beavs AI is an application that provides an AI Chatbot that is knowledgeable abo Tom Nyuma - - + From 149ea0f695ff4a972b38f7845d0c7675544c7a70 Mon Sep 17 00:00:00 2001 From: Muhammad Akbar Date: Wed, 30 Oct 2024 18:37:22 -0700 Subject: [PATCH 2/5] Added my name and profile to contributors(kept template) --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fb76c49..89bafcd 100644 --- a/README.md +++ b/README.md @@ -68,12 +68,18 @@ Beavs AI is an application that provides an AI Chatbot that is knowledgeable abo Tom Nyuma + +
Muhammad Akbar - From b02b9ae7e07468abb2bc09a0057f4d07e80e9c6b Mon Sep 17 00:00:00 2001 From: Muhammad Akbar Date: Wed, 30 Oct 2024 19:17:29 -0700 Subject: [PATCH 3/5] used prettier to clean readme format --- README.md | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0d791e4..9145785 100644 --- a/README.md +++ b/README.md @@ -93,20 +93,24 @@ Beavs AI is an application that provides an AI Chatbot that is knowledgeable abo
[Full Name] + <<<<<<< HEAD <<<<<<< HEAD - --> - - -
- Muhammad Akbar - -======= - --> ->>>>>>> 52d2a688a6f29187328ceb86f6207e251a4fc33e + --> + + +
+Muhammad Akbar + ======= + --> + +> > > > > > > # 52d2a688a6f29187328ceb86f6207e251a4fc33e + --> ->>>>>>> d3b1f0b2c7ac7172e2a2f80117f0b5e16e318e52 + +> > > > > > > d3b1f0b2c7ac7172e2a2f80117f0b5e16e318e52 + From 4d2056dbf804d65b9212ed490224599444f29787 Mon Sep 17 00:00:00 2001 From: Muhammad Akbar Date: Wed, 30 Oct 2024 19:21:20 -0700 Subject: [PATCH 4/5] did prettier a 2nd time --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9145785..365a280 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,7 @@ Beavs AI is an application that provides an AI Chatbot that is knowledgeable abo <<<<<<< HEAD <<<<<<< HEAD + --> From 6c524c30eee383a6ac2f77052db33b1a4cf592ae Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 30 Oct 2024 20:15:01 -0700 Subject: [PATCH 5/5] docs: fix issues with merge --- README.md | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 365a280..1a3ba90 100644 --- a/README.md +++ b/README.md @@ -68,52 +68,32 @@ Beavs AI is an application that provides an AI Chatbot that is knowledgeable abo Tom Nyuma - +
Nirali Mehta - +
Sean Gutmann - - --> - + + +
Muhammad Akbar - + - - + - - -
-Muhammad Akbar - -======= - --> - -> > > > > > > # 52d2a688a6f29187328ceb86f6207e251a4fc33e - - --> - -> > > > > > > d3b1f0b2c7ac7172e2a2f80117f0b5e16e318e52 - + + --> -