Skip to content

Commit

Permalink
Resolved merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanzin7 authored and Stanzin7 committed Oct 19, 2023
2 parents 6431a2b + bf6854e commit 310619d
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 13 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

<h2> A chatbot designed to assist Firefox users in discovering the perfect browser extension based on their specific needs. </h2>

<img width="1435" alt="Screenshot 2023-10-15 at 3 20 10 PM" src="https://github.com/Stanzin7/Mozilla-Addon-Assistant/assets/109467334/bece7511-54c7-421e-97e1-551a5378c36a">
<img width="1435" alt="firefox-chatbot" src="assets/images/Firefox.png">

<img width="1435" alt="firefox-chatbot" src="assets/images/Firefox2.png">

## Table of Contents

Expand Down
Binary file added assets/images/Firefox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/firefox2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 0 additions & 8 deletions data/data.txt

This file was deleted.

2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,6 @@ <h2>FireExtend Assistant</h2>
integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo="
crossorigin="anonymous"
></script>
<script src="/script.js"></script>
<script src="script.js"></script>
</body>
</html>
3 changes: 0 additions & 3 deletions settings.py

This file was deleted.

0 comments on commit 310619d

Please sign in to comment.