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

Add star wars spoiler #3604

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open

Add star wars spoiler #3604

wants to merge 56 commits into from

Conversation

PaulGieske
Copy link

No description provided.

kimichael and others added 30 commits February 5, 2016 21:47
@kimichael
Add one line to russian start text
e47dae5
@lhellborg
add line in swedish titta-ut
076feb9
Add new option and page
f60ea15
Merge branch 'master' into attira-il-tappeto
e2bd6c5
@givens
Add pray changes
ae6bfc8
@givens
Fix links
03a610f
@Sherartz
Add new line
5079828
@PaulGieske
Add stawr wars spoiler
f8417c0
@agmcc
Add chocolate lego platypus
11345b4
Merge pull request #3605 from agmcc/changes
500a723 
Add chocolate lego platypus
@freedspirit
Add lines to exising story re git
568de9f
Add "curandero" string and file to espanol/canudos.md
ba974eb
Add fixing lines to "curandero string"
40db9ba
Merge pull request #3609 from jplessey/jplp2_version
dfbf048 
Jplp2 version
@tomgit2
Contribute to German part of the story
0251bad
@JuliaGiner
Add new option in the main story, panic
beaf804
Merge pull request #3611 from JuGiner/change
9d4302c 
Add new option in the main story, panic
@tomgit2
Shorten line in abwarten.md
59efa46
Merge pull request #3610 from tomgit2/contrib-to-german-story
f7f2dad 
Contribute to German part of the story
@leekerley
adding beer brewing adventure
6d0ffb4
Merge pull request #3612 from leekerley/master
33778da 
adding beer brewing adventure
@tiffanystallings
Add link to "sing" for next page.
8b229a9
@tiffanystallings
Create singing.md
cadaa62
@tiffanystallings
Fix link for singing
7000101
@jackngai
Add snowman story line
7d67763
@jackngai
Add snowman choices
0b444bb
Added alfred to the story
211399e
Merge pull request #3616 from mdm24/mdmStory
6811faf 
Added alfred to the story
@jackngai
Merge branch 'master' into jn_adventure
7785715
@jackngai
Adjust snowman format
b7b7d37
rob-johnston and others added 24 commits February 10, 2016 17:42
@rob-johnston
Contribute to English story
01cd40a
Merge pull request #3618 from rob-johnston/my-branch
edd8738 
Contribute to English story
@BrendanFDMoore
Add simple branch for PR
93403ae
Merge pull request #3620 from BrendanFDMoore/alt-simple
6a94948 
Add simple branch for PR
@kjoller
Added bicycle ride to Danish story
3610553
Merge pull request #3621 from kjoller/bicycle-ride
d2a7865 
Added bicycle ride to Danish story
@tiffanystallings
Update blah-blah.md
ab699ae
@tiffanystallings
Fix line deletions
9186211
Merge pull request #3613 from tiffanystallings/master
b347622 
Extended /blah-balh
add something
a5d3e68
Merge pull request #3622 from lcastrooliveira/mychanges
4c745bc 
Please review this, @casey-collab
@jackngai
Adjust folder structure
0948b9a
@jackngai
Delete moved files from commit
0b204a5
@jackngai
Merge branch 'master' into jn_adventure
3016b56
Merge pull request #3617 from jackngai/jn_adventure
e73d689 
Jn adventure
@ksuj15
Add Gibberish
e807f4d
Merge pull request #3625 from abdul-rafey/test2
2a05e5b 
Add Gibberish
@CarolineIacono
adding a line
85de1b7
Merge pull request #3626 from CarolineStewart/master
1c928ad 
adding a line
Merge pull request #3551 from kimichael/master
6b71d02 
Add one line to russian start text
Merge pull request #3582 from lhellborg/lh
b7f40c5 
add line in swedish titta-ut
Merge pull request #3587 from gabrielemeloncelli/attira-il-tappeto
73aa2c4 
Add new option and page
Merge pull request #3596 from givens/brendhan
6bfa73a 
Add pray changes
Merge pull request #3601 from Sherartz/newline
b6dcbd9 
Add new line
@pmallory
Copy link
Contributor

@casey-collab Can you review this PR please?

@casey-collab
Copy link
Contributor

Unfortunately, this pull request conflicts with another change. Could you merge the master branch of the original repository into your branch, resolve the merge conflicts, and update the pull request?

casey-collab
casey-collab reviewed Feb 11, 2016
View reviewed changes
english/star-wars-spoiler/star-wars.md
@@ -1,3 +1,5 @@
Bad idea. The internet destroyed you for even contemplating such a thing.

[Go Back...](../marshmallow.md).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, pull requests that delete or modify lines are not eligible for automatic merging. If you wish to have this pull request auto-merged, please update it to only add lines. If you don't think you've modified any lines, remember that I consider changing the whitespace (e.g. deleting a space at the end of a line) a modification, even though it may be hard to tell the difference on GitHub.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,

I'm having some trouble add the content without somehow deleting the last line of the file. I think it is because there is no blank line at the end of the document. See issue #2637.
(Issue #2637)

Can you please add a blank line at the end of the file?

Thanks,
Paul

@casey-collab
Copy link
Contributor

Besides my other comments, this looks good! Once you respond to those, this should be good to merge.

Casey Collaborator and others added 2 commits February 11, 2016 14:47
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.