Skip to content
This repository has been archived by the owner on Feb 22, 2024. It is now read-only.

Add Vera to contributors in pom.xml #465

Merged
merged 2 commits into from
May 31, 2017
Merged

Add Vera to contributors in pom.xml #465

merged 2 commits into from
May 31, 2017

Conversation

asylunatic
Copy link
Contributor

No description provided.

@AZWN AZWN requested review from jwgmeligmeyling and removed request for jwgmeligmeyling May 29, 2017 07:37
Copy link
Member

@Fastjur Fastjur left a comment

Choose a reason for hiding this comment

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

There are conflicts when merging this branch. Please resolve this locally and then push this upstream.

You can either rebase (preferred), or manually merge.

Copy link
Member

@jwgmeligmeyling jwgmeligmeyling left a comment

Choose a reason for hiding this comment

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

One small change requested, and the commit has to be rebased too. If you don't know how, we can do this at the labwork too.

pom.xml Outdated
@@ -30,7 +30,7 @@
<logback.version>1.1.11</logback.version>
<selenium.version>3.0.0</selenium.version>
<build.server.version>1.2.0</build.server.version>
<git.server.version>1.0.10</git.server.version>
<git.server.version>1.0.11-SNAPSHOT</git.server.version>
Copy link
Member

Choose a reason for hiding this comment

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

Actually this should only change in your feature branch, and not in this commit. Can you undo this change here?

@asylunatic
Copy link
Contributor Author

@jwgmeligmeyling I changed that back, do I still need to rebase?

@jwgmeligmeyling
Copy link
Member

Thanks! Yes it has still to be rebased, as there are merge conflicts with the master branch (other students pushed to the contributors section of the POM-file too)

@coveralls
Copy link

Coverage Status

Coverage remained the same at 55.993% when pulling 30e7f65 on addVeraToPom into f36bca0 on master.

@jwgmeligmeyling jwgmeligmeyling merged commit b9badfc into master May 31, 2017
@jwgmeligmeyling jwgmeligmeyling deleted the addVeraToPom branch May 31, 2017 07:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants