fix merge conflit solve (feea0dac) · Commits · Alixan / Chiirz · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Chiirz
- Activity
- Members
- Labels
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Alixan
Chiirz
Commits
feea0dac

Commit feea0dac authored 2 years ago by

Lili Debieve

Downloads
- Plain Diff

fix merge conflit solve

parents cb54199f b081e362

Branches

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

chiirz/.env 2 additions, 1 deletion

chiirz/.env
chiirz/public/css/components/_hero.scss 5 additions, 3 deletions

chiirz/public/css/components/_hero.scss
chiirz/public/css/components/_login.scss 2 additions, 0 deletions

chiirz/public/css/components/_login.scss
chiirz/public/css/components/_nav.scss 1 addition, 1 deletion

chiirz/public/css/components/_nav.scss
chiirz/public/css/components/_new-itinary.scss 6 additions, 6 deletions

chiirz/public/css/components/_new-itinary.scss
chiirz/public/css/components/_register.scss 8 additions, 1 deletion

chiirz/public/css/components/_register.scss
chiirz/public/css/components/_users.scss 1 addition, 0 deletions

chiirz/public/css/components/_users.scss
chiirz/public/css/main.css 21 additions, 11 deletions

chiirz/public/css/main.css
chiirz/templates/base.html.twig 1 addition, 0 deletions

chiirz/templates/base.html.twig
chiirz/templates/itinerary/new.html.twig 1 addition, 1 deletion

chiirz/templates/itinerary/new.html.twig

with 48 additions and 24 deletions

0% 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