Skip to content

Commit

Permalink
resolve-conflicts-final
Browse files Browse the repository at this point in the history
  • Loading branch information
Arveti-likhitha committed Oct 31, 2024
1 parent a7d11a0 commit c1f79e3
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -547,26 +547,26 @@ <h1>TourGuide . . .</h1>
<a href="#" class="nav__logo" data-aos="fade-right">Tourguide<span>.</span></a>
</div>

<ul class="navLinks">
<li class="link" id="View-link" data-aos=""><a href="mapa.html">View</a></li>
<li class="link" id="LogIn-link" data-aos=""><a href="newLogin.html">Log In</a></li>
<li class="link" data-aos=""><a href="#Home">Home</a></li>
<li class="link" data-aos=""><a href="./about.html">About</a></li>
<li class="link dropdown" data-aos="">
<a href="#Services" class="dropdown">Services</a>
<ul class="dropdown-menu">
<li><a href="/trending.html">Destination</a></li>
<li><a href="/packages.html">Prices</a></li>
<li><a href="/index.html">Trip Gallery</a></li>
<li><a href="/index.html">Tourist Guide</a></li>
<li><a href="/hotel.html">Hotel & Resort</a></li>
</ul>
</li>
<li class="link" data-aos=""><a href="./topdeals/topdeals.html">Top Deals</a></li>
<li class="link" data-aos=""><a href="./packages.html">Packages</a></li>
<li class="link" data-aos=""><a href="#testimonials">Testimonial</a></li>
<li class="link" data-aos=""><a href="feedback.html">Rate Us?</a></li>
<li class="link" data-aos=""><a href="#cnt-form">Contact Us</a></li>
<ul class="navLinks">
<li class="link" id="View-link" data-aos=""><a href="mapa.html">View</a></li>
<li class="link" id="LogIn-link" data-aos=""><a href="newLogin.html">Log In</a></li>
<li class="link" data-aos=""><a href="#Home">Home</a></li>
<li class="link" data-aos=""><a href="./about.html">About</a></li>
<li class="link dropdown" data-aos="">
<a href="#Services" class="dropdown">Services</a>
<ul class="dropdown-menu">
<li><a href="/trending.html">Destination</a></li>
<li><a href="/packages.html">Prices</a></li>
<li><a href="/index.html">Trip Gallery</a></li>
<li><a href="/index.html">Tourist Guide</a></li>
<li><a href="/hotel.html">Hotel & Resort</a></li>
</ul>
</li>
<li class="link" data-aos=""><a href="./topdeals/topdeals.html">Top Deals</a></li>
<li class="link" data-aos=""><a href="./packages.html">Packages</a></li>
<li class="link" data-aos=""><a href="#testimonials">Testimonial</a></li>
<li class="link" data-aos=""><a href="feedback.html">Rate Us?</a></li>
<li class="link" data-aos=""><a href="#cnt-form">Contact Us</a></li>
</ul>

<div class="contact-btns">
Expand Down

0 comments on commit c1f79e3

Please sign in to comment.