fix merge

This commit is contained in:
Nicolas Grekas 2017-01-23 09:33:02 +01:00
parent 61475b5596
commit 60d7d437b5
3 changed files with 7 additions and 14 deletions

View File

@ -1,11 +1,9 @@
alias_1
~~~~~~~
### alias_1
- Service: `service_1`
- Public: yes
service_1
~~~~~~~~~
### service_1
- Class: `Full\Qualified\Class1`
- Public: yes

View File

@ -1,11 +1,9 @@
alias_2
~~~~~~~
### alias_2
- Service: `service_2`
- Public: no
service_2
~~~~~~~~~
### service_2
- Class: `Full\Qualified\Class2`
- Public: no

View File

@ -4,8 +4,7 @@ Public services
Definitions
-----------
definition_1
~~~~~~~~~~~~
### definition_1
- Class: `Full\Qualified\Class1`
- Public: yes
@ -22,14 +21,12 @@ definition_1
Aliases
-------
alias_1
~~~~~~~
### alias_1
- Service: `service_1`
- Public: yes
alias_2
~~~~~~~
### alias_2
- Service: `service_2`
- Public: no