fix merge confliction (2682efd2) · Commits · Recolic / ali-middleware-5-sync · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ali-middleware-5-sync
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

2682efd2

There was an error fetching the commit references. Please try again later.

Commit 2682efd2 authored 5 years ago by Aiolos

Downloads
- Plain Diff

fix merge confliction

parents 6e484c14 a47aa994

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

workspace-gateway/src/main/java/com/aliware/tianchi/CallbackListenerImpl.java 2 additions, 0 deletions

...c/main/java/com/aliware/tianchi/CallbackListenerImpl.java
workspace-provider/src/main/java/com/aliware/tianchi/CallbackServiceImpl.java 45 additions, 4 deletions

...rc/main/java/com/aliware/tianchi/CallbackServiceImpl.java

with 47 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment