Skip to content

Tests for PilotCStoJson + users withpout DN#1

Open
ptakha wants to merge 6 commits into
wkrzemien:addDNInformationToJsonfrom
ptakha:addDNInformationToJson
Open

Tests for PilotCStoJson + users withpout DN#1
ptakha wants to merge 6 commits into
wkrzemien:addDNInformationToJsonfrom
ptakha:addDNInformationToJson

Conversation

@ptakha

@ptakha ptakha commented Apr 4, 2019

Copy link
Copy Markdown

No description provided.

@wkrzemien

Copy link
Copy Markdown
Owner

You must resolve the conflict in the PilotCStoJSonSynchronizer (see:
https://help.github.com/en/articles/resolving-a-merge-conflict-on-github )
Meanwhile I had to edit it because of the comments I received here:
DIRACGrid#4008

@ptakha

ptakha commented Apr 5, 2019 via email

Copy link
Copy Markdown
Author

@wkrzemien

wkrzemien commented Apr 5, 2019 via email

Copy link
Copy Markdown
Owner

@ptakha

ptakha commented Apr 5, 2019 via email

Copy link
Copy Markdown
Author

@ptakha

ptakha commented Nov 6, 2019 via email

Copy link
Copy Markdown
Author

wkrzemien pushed a commit that referenced this pull request Feb 25, 2020
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.

2 participants