From f3f75d52aede3a3348aa7ece93e4232b86c7527e Mon Sep 17 00:00:00 2001 From: likhithaarveti Date: Tue, 29 Oct 2024 10:36:08 +0530 Subject: [PATCH 01/14] fixed-directing-to-different-pages-from-plan-a-trip-page-and-image-slider-to-stop-when-it-reaches-the-last-image --- index.html | 4 ++-- plantrip.html | 37 ++++++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index ff3f735a..22c1d2a9 100644 --- a/index.html +++ b/index.html @@ -551,7 +551,7 @@

TourGuide . . .

diff --git a/plantrip.html b/plantrip.html index fde8a61e..90ae6574 100644 --- a/plantrip.html +++ b/plantrip.html @@ -166,15 +166,15 @@
- +
- -
- - - -
+ + + + +
@@ -299,7 +301,7 @@ - + diff --git a/topdeals/topdeals.html b/topdeals/topdeals.html index 193cf8a1..7c02d63f 100644 --- a/topdeals/topdeals.html +++ b/topdeals/topdeals.html @@ -305,11 +305,11 @@ @@ -319,13 +319,17 @@ - - - - + + + + + + + + + + + From 74268aaf181b3d98ff2f02582fd8cf86b6e0a1ce Mon Sep 17 00:00:00 2001 From: Paila Murali <114466262+murali127@users.noreply.github.com> Date: Wed, 30 Oct 2024 13:06:46 +0000 Subject: [PATCH 08/14] updated payment section navigation links --- payment.html | 59 +++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/payment.html b/payment.html index 2c93c266..70c97a2b 100644 --- a/payment.html +++ b/payment.html @@ -39,34 +39,37 @@
- - - - - - + + + + + + From 2a4f03193620df862316b1712f8e147a6df0b740 Mon Sep 17 00:00:00 2001 From: Paila Murali <114466262+murali127@users.noreply.github.com> Date: Thu, 31 Oct 2024 07:53:25 +0000 Subject: [PATCH 09/14] merged From f5f92839d0e538f4d5fbd5b0cf475f3799133f12 Mon Sep 17 00:00:00 2001 From: Paila Murali <114466262+murali127@users.noreply.github.com> Date: Thu, 31 Oct 2024 07:54:06 +0000 Subject: [PATCH 10/14] #2 From 3f93b3d8a6883124a6f5582ca8052dcf30e5bb86 Mon Sep 17 00:00:00 2001 From: Paila Murali <114466262+murali127@users.noreply.github.com> Date: Thu, 31 Oct 2024 07:58:46 +0000 Subject: [PATCH 11/14] merge conflicts resolved --- index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 0cfe58ae..2c4af589 100644 --- a/index.html +++ b/index.html @@ -555,11 +555,11 @@

TourGuide . . .

From a7d11a048b3d3ccf28f9d9d848276590f0ce58d7 Mon Sep 17 00:00:00 2001 From: likhithaarveti Date: Thu, 31 Oct 2024 17:33:43 +0530 Subject: [PATCH 12/14] resolve-conflicts --- index.html | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/index.html b/index.html index 00c37459..1ef190cf 100644 --- a/index.html +++ b/index.html @@ -547,26 +547,26 @@

TourGuide . . .

-