search

gbowne1 / spmssite

The code for my old business website.
GNU General Public License v3.0
8 stars 31 forks source link

contact page added #23

Closed mu-irfan closed 2 years ago

mu-irfan commented 2 years ago

Hey @gbowne1 contact page added as per your requirments and map also added

-> Output

a

gbowne1 commented 2 years ago

Hmm this has conflicts. Unable to merge.

mu-irfan commented 2 years ago

Hmm this has conflicts. Unable to merge.

conflict? which type of conflict?

gbowne1 commented 2 years ago

GitHub just says this has merge conflicts so it is not able to merge. I will review and see what the problem is when I return later today it is early here

mu-irfan commented 2 years ago

GitHub just says this has merge conflicts so it is not able to merge. I will review and see what the problem is when I return later today it is early here

ok

gbowne1 commented 2 years ago

I have a hunch it might be in styles.css though just looking at it

mu-irfan commented 2 years ago

@gbowne1 conflict removed check now. conflict in css file so i remove it. now you can merge it

gbowne1 commented 2 years ago

That seems to have worked.. thanks. Merging