search

pclubuiet / website

Programming club, PU official website.
https://pclubuiet.herokuapp.com
GNU General Public License v3.0
14 stars 70 forks source link

Add footer to the home page #61

Closed illseption closed 7 years ago

illseption commented 7 years ago

Added footer to the file home.html Footer says "Copyright 2017, All Rights Reserved" Fixes #3

illseption commented 7 years ago

But I did add a footer to home.html and on clicking on it, it does show the footer text.

divyam3897 commented 7 years ago

You have not done rebase which is the reason for your conflicts.

illseption commented 7 years ago

What do I do then? I checked the branches and both say they are up to date.

divyam3897 commented 7 years ago

Switch to master, change remote to pclub original repo, do git pull, checkout to your branch, do rebase, set remote to your forked repo and push the changes.

divyam3897 commented 7 years ago

It has been fixed in https://github.com/pclubuiet/website/commit/44e7fdc0bfc83b6f32e9c013a08dda949fcf2f9a Thanks