search

Vandivier / data-science-practice

practicing basic data skills
1 stars 1 forks source link

Sortingoutthosedamntextboxes #11

Closed Mbjoerkh closed 6 years ago

Mbjoerkh commented 6 years ago

RA Proofreading Complete

Vandivier commented 6 years ago

@Mbjoerkh please adopt master's package.json as it is conflicted:

"csv-reorder": "^0.1.1",
"genderize": "^1.5.2",
"js-beautify": "^1.7.5"
Mbjoerkh commented 6 years ago

Done (I think...)

On Fri, Jan 26, 2018 at 4:30 PM, John Vandivier notifications@github.com wrote:

@Mbjoerkh https://github.com/mbjoerkh please adopt master's package.json as it is conflicted:

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Vandivier/data-science-practice/pull/11#issuecomment-360909593, or mute the thread https://github.com/notifications/unsubscribe-auth/Afq-PjTiAuEld2qigBJJRHK3fNEZVw3Xks5tOkQPgaJpZM4RuoGb .

Vandivier commented 6 years ago

are you looking at this pull request page? https://github.com/Vandivier/data-science-practice/pull/11

there is one line left in conflict because the indentation differs

Mbjoerkh commented 6 years ago

My bad. Didn't see the diff bt tab and spaces when looking in notepad..

On Fri, Jan 26, 2018 at 4:44 PM, John Vandivier notifications@github.com wrote:

are you looking at this pull request page? #11 https://github.com/Vandivier/data-science-practice/pull/11

there is one line left in conflict because the indentation differs

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Vandivier/data-science-practice/pull/11#issuecomment-360912725, or mute the thread https://github.com/notifications/unsubscribe-auth/Afq-PrUsAyaW4026_MuCI5axXoyj6fooks5tOkdCgaJpZM4RuoGb .