Skip to content

testファイルを作成しました#4

Merged
nnahito merged 2 commits intomasterfrom
feature/add_file_takata
Jul 4, 2015
Merged

testファイルを作成しました#4
nnahito merged 2 commits intomasterfrom
feature/add_file_takata

Conversation

@nnahito
Copy link
Copy Markdown
Collaborator

@nnahito nnahito commented Jul 4, 2015

No description provided.

@tSeiya
Copy link
Copy Markdown
Owner

tSeiya commented Jul 4, 2015

コンフリクトすると思うので,ファイル名変えてね!

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

hogehogeはやめよう
testtestにしよう!

@tSeiya
Copy link
Copy Markdown
Owner

tSeiya commented Jul 4, 2015

okです

@nnahito nnahito merged commit 6a96f06 into master Jul 4, 2015
@nnahito nnahito deleted the feature/add_file_takata branch July 4, 2015 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants