Merge lp:~gesha/linaro-license-protection/textile-view into lp:~linaro-infrastructure/linaro-license-protection/textile-view
Proposed by
Georgy Redkozubov
Status: | Merged |
---|---|
Merged at revision: | 141 |
Proposed branch: | lp:~gesha/linaro-license-protection/textile-view |
Merge into: | lp:~linaro-infrastructure/linaro-license-protection/textile-view |
Diff against target: |
95 lines (+33/-7) (has conflicts) 2 files modified
license_protected_downloads/render_text_files.py (+20/-5) license_protected_downloads/tests/test_render_text_files.py (+13/-2) Text conflict in license_protected_downloads/render_text_files.py |
To merge this branch: | bzr merge lp:~gesha/linaro-license-protection/textile-view |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stevan Radaković | Approve | ||
Review via email: mp+129863@code.launchpad.net |
Description of the change
These revs add sorting to the list of paths based on pre-defined list of files to display and pep8 fixes.
To post a comment you must log in.
Gesha, there are some conflicts in the merge. Can you please take a look?