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.

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

Added Fall 2015 Seminar Files #106

Merged
merged 1 commit into from
Dec 5, 2015
Merged

Added Fall 2015 Seminar Files #106

merged 1 commit into from
Dec 5, 2015

Conversation

fcjou
Copy link
Contributor

@fcjou fcjou commented Nov 30, 2015

  • Added all the Fall 2015 Seminar Files (for all seminars whose
    information has already been populated)
  • Changed the 'name' field to handle multiple entries
  • Added a 'location' field

@jayfo
Copy link
Member

jayfo commented Nov 30, 2015

Note that the build test failed here. I had the same issue with my initial copy/paste of some text.

You can see the error by following the details link:

https://travis-ci.org/uwdub/web-dub/builds/93873926

The problem is a smart quote somewhere in a file.

@fcjou
Copy link
Contributor Author

fcjou commented Dec 5, 2015

The smart quotes are fixed, and I also updated/added the name and date fields.

@jayfo
Copy link
Member

jayfo commented Dec 5, 2015

Since the second commit was a "fix", not distinct content, "style" says you squash it:

git checkout master
git pull
git push

git checkout calendar-files
git rebase -i master
git push -f

- Added all the Fall 2015 Seminar Files
- Changed the 'name' field to handle multiple entries
- Added a 'location' field
- Added a 'date' field
@fcjou
Copy link
Contributor Author

fcjou commented Dec 5, 2015

Done!

jayfo added a commit that referenced this pull request Dec 5, 2015
Added Fall 2015 Seminar Files
@jayfo jayfo merged commit 2724d67 into uwdub:master Dec 5, 2015
This was referenced Dec 6, 2015
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.

None yet

2 participants