forked from OCA/hr
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove merged pending-merges from oca/hr
- Loading branch information
Showing
2 changed files
with
2 additions
and
10 deletions.
There are no files selected for viewing
Submodule hr
updated
21 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ | |
| camptocamp: [email protected]:camptocamp/server-tools.git | ||
| merges: | ||
| - oca 10.0 | ||
| # add module account_invoice_bank_selection | ||
| # Migration of server_environment to 10.0 | ||
| - oca refs/pull/595/head | ||
| target: &default_target camptocamp merge-branch-1900-master | ||
| ./external-src/sale-workflow: | ||
|
|
@@ -28,14 +28,6 @@ | |
| camptocamp: [email protected]:camptocamp/hr.git | ||
| merges: | ||
| - oca 10.0 | ||
| # hr_contract_reference | ||
| - oca refs/pull/316/head | ||
| # hr_employee_birth_name | ||
| - oca refs/pull/318/head | ||
| # hr_experience | ||
| - oca refs/pull/306/head | ||
| # hr_employee_seniority | ||
| # - oca refs/pull/319/head | ||
| # hr_employee_social_media | ||
| - oca refs/pull/317/head | ||
| target: *default_target | ||