Merge lp://qastaging/~cv.clearcorp/openerp-ccorp-trainings/trunk-lp-bugs into lp://qastaging/openerp-ccorp-trainings/2012-06-ctp-technical-costa-rica
Proposed by
Carlos Vásquez (ClearCorp)
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~cv.clearcorp/openerp-ccorp-trainings/trunk-lp-bugs | ||||
| Merge into: | lp://qastaging/openerp-ccorp-trainings/2012-06-ctp-technical-costa-rica | ||||
| Diff against target: |
109 lines (+85/-0) (has conflicts) 3 files modified
LICENSE (+49/-0) cv_clearcorp/__init__.py (+4/-0) cv_clearcorp/__openerp__.py (+32/-0) Path conflict: cv_clearcorp / cv_clearcorp Text conflict in cv_clearcorp/__init__.py Text conflict in cv_clearcorp/__openerp__.py |
||||
| To merge this branch: | bzr merge lp://qastaging/~cv.clearcorp/openerp-ccorp-trainings/trunk-lp-bugs | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Carlos Vásquez (ClearCorp) | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 3. By Carlos Vásquez (ClearCorp)
-
[FIX] corrección necesaria para .......
- 2. By Carlos Vásquez (ClearCorp)
-
[MRG] with 2012-06-
ctp-technical- training- costa-rica - 1. By Carlos Vásquez (ClearCorp)
-
[ADD] created branch
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
