Skip to content
  • This project
    • Loading...
  • Sign in

Barry / ffxi-db-converter

Go to a project
Toggle navigation
Toggle navigation pinning
  • Projects
  • Groups
  • Snippets
  • Help
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 1
  • Wiki
  • Network
  • Create a new issue
  • Builds
  • Commits
  • Issue Boards
Merged
Merge Request !1 opened 2016-09-29 14:39:22 UTC by Gravenet@Gravenet

Update Print Statement

Updated Print statement to newer version of python which requires () around the statement.

Edited 2016-09-29 14:45:47 UTC
Request to merge Gravenet:master into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch http://git.savsoul.com/Gravenet/ffxi-db-converter.git master
git checkout -b Gravenet/ffxi-db-converter-master FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff Gravenet/ffxi-db-converter-master

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Merged

The changes were merged into master.

  • Discussion 0
  • Commits 2
  • Changes 1
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Barry
    @barry

    Added 1 commit:

    • 03ad19d5 - Removed debug print
    2016-09-29 14:45:35 UTC

    Added 1 commit:

    • 03ad19d5 - Removed debug print
    Toggle commit list
  • Barry
    @barry

    Status changed to merged

    2016-09-29 14:45:47 UTC

    Status changed to merged

    Toggle commit list
  • Barry
    @barry

    mentioned in commit a3a7a20c

    2016-09-29 14:45:47 UTC

    mentioned in commit a3a7a20c

    Toggle commit list
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
2
2 participants
Reference: barry/ffxi-db-converter!1
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.