search

saltstack-formulas / gitlab-formula

http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html
Apache License 2.0
29 stars 49 forks source link

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

Open fessoga5 opened 9 years ago

fessoga5 commented 9 years ago

I've changed state so that it meet requirements

fessoga5 commented 9 years ago

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

gravyboat commented 9 years ago

@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 commented 9 years ago

Merge conflicts. Please reset base.