Skip to content

Conversation

@annaboodle
Copy link

Fixed PR to only edit data/scss files!

Comparison:
ludwig

@una
Copy link
Owner

una commented Oct 20, 2016

Awesome, thank you!!

Can you do me one more favor? Run git pull --rebase origin master and fix the merge conflict in cssgram.scss. It should look like:

@import 'aden';
@import 'inkwell';
@import 'perpetua';
@import 'reyes';
@import 'gingham';
@import 'toaster';
@import 'walden';
@import 'hudson';
@import 'earlybird';
@import 'mayfair';
@import 'lofi';
@import '1977';
@import 'brooklyn';
@import 'xpro2';
@import 'nashville';
@import 'lark';
@import 'moon';
@import 'clarendon';
@import 'willow';
@import 'rise';
@import 'slumber';
@import 'brannan';
@import 'valencia';
@import 'kelvin';
@import 'ludwig';

@annaboodle
Copy link
Author

@una Could you explain a bit more what you mean? I ran git pull --rebase origin master, but didn't see any merge conflicts in cssgram.scss. My file looks like yours, except the @imports are in a slightly different order...

@una
Copy link
Owner

una commented Oct 27, 2016

Right the order would cause a merge conflict. Is it not?

@una
Copy link
Owner

una commented Nov 2, 2016

The branch has merge conflicts still -- did you get those resolved? I'm happy to walk you through it if you need!

@una una closed this Nov 2, 2016
@una una reopened this Nov 2, 2016
BuZZ-dEE added a commit to BuZZ-dEE/SVGram that referenced this pull request Mar 14, 2020
According to pull request for CSSgram

una/CSSgram#221
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.

2 participants