Fix merge conflict (665da945) · Commits · SciPost / SciPost · GitLab

SciPost Code Repository

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SciPost
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

665da945

Commit 665da945 authored 7 years ago by Jorran de Wit

Downloads
- Plain Diff

Fix merge conflict

parents 88e15ea7 9ee7e04a

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

partners/admin.py 10 additions, 8 deletions

partners/admin.py
partners/models.py 0 additions, 1 deletion

partners/models.py
scipost/templates/scipost/about.html 1 addition, 1 deletion

scipost/templates/scipost/about.html
templates/email/email_prospartner_contact.html 6 additions, 5 deletions

templates/email/email_prospartner_contact.html
templates/email/email_prospartner_contact_html.html 6 additions, 5 deletions

templates/email/email_prospartner_contact_html.html

with 23 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

SciPost Code Repository