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

Please Please Please!!!! #2

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

Commits on Sep 9, 2017

  1. タイトルの変更

    megane9988 committed Sep 9, 2017
    Configuration menu
    Copy the full SHA
    303b14c View commit details
    Browse the repository at this point in the history
  2. access.htmlの追加

    megane9988 committed Sep 9, 2017
    Configuration menu
    Copy the full SHA
    1d7c707 View commit details
    Browse the repository at this point in the history
  3. access.htmlの削除

    megane9988 committed Sep 9, 2017
    Configuration menu
    Copy the full SHA
    d2171df View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8d242ea View commit details
    Browse the repository at this point in the history
  5. 予約の内容の更新

    megane9988 committed Sep 9, 2017
    Configuration menu
    Copy the full SHA
    c76c448 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4951d95 View commit details
    Browse the repository at this point in the history
  7. オセアニアに変更

    担当者大丈夫?頑張っていただきたい。
    megane9988 committed Sep 9, 2017
    Configuration menu
    Copy the full SHA
    0c7a8a6 View commit details
    Browse the repository at this point in the history
  8. 道案内に変更

    megane9988 committed Sep 9, 2017
    Configuration menu
    Copy the full SHA
    0d8c664 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'TaskA'

    megane9988 committed Sep 9, 2017
    Configuration menu
    Copy the full SHA
    c4b763f View commit details
    Browse the repository at this point in the history
  10. 沖縄プレミアムリゾート

    沖縄にいきたい。コンフリクトの練習
    megane9988 committed Sep 9, 2017
    Configuration menu
    Copy the full SHA
    d09fb54 View commit details
    Browse the repository at this point in the history
  11. シンガポールに変更

    タイトルを変更します。
    megane9988 committed Sep 9, 2017
    Configuration menu
    Copy the full SHA
    afee217 View commit details
    Browse the repository at this point in the history
  12. Merge branch 'TaskA'

    # Conflicts:
    #	index.html
    megane9988 committed Sep 9, 2017
    Configuration menu
    Copy the full SHA
    97f542c View commit details
    Browse the repository at this point in the history