Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Groupes locaux #2

Open
wants to merge 1 commit into
base: 2015-proposition-1
Choose a base branch
from
Open

Groupes locaux #2

wants to merge 1 commit into from

Conversation

asplamagnifique
Copy link

No description provided.

@Artusamak
Copy link
Contributor

T'as réussi à faire un conflit. T'es passée par l'interface ? Si oui, t'es balaise.

@asplamagnifique
Copy link
Author

oui je suis passée par l'interface :)
help

@Artusamak
Copy link
Contributor

Je dirais qu'il faut que tu refasses tes modifs du document à partir de sa version en l'état et abandonner cette pull request par la suite.
(Sinon tu sors ton client git, tu résouds le conflit, tu pulles, tu pushes, tu merges (demande à Céline si tu as besoin).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@asplamagnifique @Artusamak