Merge lp://staging/~unifield-team/unifield-wm/bklg-first-release into lp://staging/unifield-wm

Proposed by jftempo
Status: Needs review
Proposed branch: lp://staging/~unifield-team/unifield-wm/bklg-first-release
Merge into: lp://staging/unifield-wm
Diff against target: 33 lines (+6/-1) (has conflicts)
2 files modified
import_data/import_data.py (+2/-1)
product_list/product_list.py (+4/-0)
Text conflict in product_list/product_list.py
To merge this branch: bzr merge lp://staging/~unifield-team/unifield-wm/bklg-first-release
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+248504@code.staging.launchpad.net
To post a comment you must log in.

Unmerged revisions

2370. By Quentin THEURET @Amaris

BKLG-2 [FIX] Fix issue when importing file for IR/FO that has no currency row at the end of the lines

2369. By Quentin THEURET @Amaris

BKLG-11 [FIX] Fixed issue when import product data file

2368. By Quentin THEURET @Amaris

BKLG-11 [MERGE] Merge BKLG-11 branch - lp:~unifield-team/unifield-wm/bklg-11

2367. By Quentin THEURET @Amaris

BKLG-5 [MERGE] Merge BKLG-5 branch - lp:~unifield-team/unifield-wm/bklg-5

2366. By Quentin THEURET @Amaris

BKLG-2 [MERGE] Merge BKLG-2 branch - lp:~unifield-team/unifield-wm/bklg-2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches