Skip to content

I've changed state so that it meet requirements#12

Open
fessoga5 wants to merge 1 commit intosaltstack-formulas:masterfrom
fessoga5:master
Open

I've changed state so that it meet requirements#12
fessoga5 wants to merge 1 commit intosaltstack-formulas:masterfrom
fessoga5:master

Conversation

@fessoga5
Copy link
Copy Markdown

I've changed state so that it meet requirements

@fessoga5
Copy link
Copy Markdown
Author

You can make git reset? I join all changes in singe commit!

@gravyboat
Copy link
Copy Markdown
Contributor

@fessoga5 You should be able to do a local reset since I think you've been doing most of the recent changes and it should be set to go.

@nmadhok
Copy link
Copy Markdown
Contributor

nmadhok commented Mar 26, 2015

Merge conflicts. Please reset base.

EvaSDK pushed a commit to EvaSDK/gitlab-formula that referenced this pull request Jan 23, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants