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

fixed Massachusetts typo #95

Merged
merged 24 commits into from
Jul 13, 2016
Merged

fixed Massachusetts typo #95

merged 24 commits into from
Jul 13, 2016

Conversation

cheapwebmonkey
Copy link
Contributor

@cheapwebmonkey cheapwebmonkey commented Jul 11, 2016 •
edited
Loading

No description provided.

@oldmud0 oldmud0 mentioned this pull request Jul 11, 2016
Merged
@oznogon
Copy link
Contributor

oznogon commented Jul 11, 2016

This typo appears in most files: https://github.com/chrislgarry/Apollo-11/search?utf8=%E2%9C%93&q=Massachussets

@cheapwebmonkey
Copy link
Contributor Author

Fixed them all

@oznogon
Copy link
Contributor

oznogon commented Jul 11, 2016 •
edited
Loading

@wopian deleted the comment this comment referred to.

@wopian
Copy link
Collaborator

wopian commented Jul 11, 2016

@oznogon yeah, I had a dumb moment and switched red and green around in my head.

Wasn't until I came back and saw what I had said and what the PR changed that I realised how stupid of a mistake I made 😢

@oznogon
Copy link
Contributor

oznogon commented Jul 11, 2016

@wopian No worries! I've gone cross-eyed looking at the scans too. I feel ya.

@chrislgarry
Copy link
Owner

This looks good to me. Please git pull and then git rebase to resolve the merge conflicts. Since this PR, we have rearranged the source into directories.

corvuscrypto and others added 12 commits July 11, 2016 22:07
@corvuscrypto @cheapwebmonkey
Reorganized files to separate Luminary099 source code from Comanche05…
2cced62 
…5 source code
@YetiCGN @cheapwebmonkey
Fix link for "Virtual AGC" in README
e5fad31
@oznogon @cheapwebmonkey
Remove apostrophe not in source scan.
0d07b62
@oznogon @cheapwebmonkey
Point README links to source scans at the scans
4dcc2e3 
Links in the README referring to the source scans point to HTML transcriptions, some of which contain typos not present in the scanned source pages. Point these links instead to the scanned source pages.
@Sam-Serpoosh @cheapwebmonkey
Fix a spacing issue between code and comment - btwn Safari & Chrome
810ec2c
@cheapwebmonkey
Merge branch 'Margeaux'
8192348
@cheapwebmonkey
added README.md from rebase
f53a271
@oznogon @cheapwebmonkey
Point README links to source scans at the scans
34ab531 
Links in the README referring to the source scans point to HTML transcriptions, some of which contain typos not present in the scanned source pages. Point these links instead to the scanned source pages.
@YetiCGN @cheapwebmonkey
Fix link for "Virtual AGC" in README
98d2e27
@cheapwebmonkey
Merge branch 'master' of https://github.com/chrislgarry/Apollo-11 int…
04cc80c 
…o Margeaux
@cheapwebmonkey
≈
46149bd
@cheapwebmonkey
added README.md
2bec76f
@cheapwebmonkey
Copy link
Contributor Author

@chrislgarry git pulled and git rebased

@chrislgarry
Copy link
Owner

@cheapwebmonkey thanks!!

@chrislgarry chrislgarry merged commit 8e01cee into chrislgarry:master Jul 13, 2016
@oldmud0
Copy link
Collaborator

oldmud0 commented Jul 13, 2016 •
edited
Loading

Whoa, this seems to have messed with the history big time. This should have been a clean rebase but it wasn't, which means that all those commits in this PR, even though they were already included in master, are essentially repeated. My PR's rebase only had one or two merge conflicts which could be automatically solved by three-way merge.

@wopian wopian added Status: Accepted Type: Proof Comanche55 and Luminary99 files and removed typo labels Dec 28, 2016
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
Type: Proof Comanche55 and Luminary99 files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@cheapwebmonkey @oznogon @wopian @chrislgarry @oldmud0 @corvuscrypto @YetiCGN @Sam-Serpoosh @felipesanches