adding buttons to the cards with hover effect animation

[Sujal1201]

buttons to the cards with hover effect animation.

before

after

DevDocsHub.-.Home.-.Google.Chrome.2024-10-06.00-06-24.mp4

**Issue #49 **

[andoriyaprashant]

@Sujal1201 Please resolve the conflicts

[Sujal1201]

what is this error sir

[andoriyaprashant]

Hello @Sujal1201
The conflict happened because pycache files were committed (which are environment-specific and shouldn't be in version control), and there were changes in the home.html file from both branches. To resolve this:

Remove pycache files from the repo using git rm -r --cached pycache/ and add them to .gitignore.
For home.html, click "Resolve conflicts" in GitHub, manually fix the differences, and commit the resolution.
This will fix the conflicts and allow the merge to proceed.

Git will show you both versions of the conflicting file, marked like this

• <<<<<<< HEAD
  (Your changes)
  =======
  (Changes from the branch you're merging into)

branch-name

• Edit the file to manually merge the changes. Once resolved, remove the conflict markers (<<<<<<<, =======, >>>>>>>).

[andoriyaprashant]

@Sujal1201 Try this, and if the error still occurs, let me know.