Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 60d7d43

Browse files
fix merge
1 parent 61475b5 commit 60d7d43

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_1.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
alias_1
2-
~~~~~~~
1+
### alias_1
32

43
- Service: `service_1`
54
- Public: yes
65

7-
service_1
8-
~~~~~~~~~
6+
### service_1
97

108
- Class: `Full\Qualified\Class1`
119
- Public: yes

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_2.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
alias_2
2-
~~~~~~~
1+
### alias_2
32

43
- Service: `service_2`
54
- Public: no
65

7-
service_2
8-
~~~~~~~~~
6+
### service_2
97

108
- Class: `Full\Qualified\Class2`
119
- Public: no

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ Public services
44
Definitions
55
-----------
66

7-
definition_1
8-
~~~~~~~~~~~~
7+
### definition_1
98

109
- Class: `Full\Qualified\Class1`
1110
- Public: yes
@@ -22,14 +21,12 @@ definition_1
2221
Aliases
2322
-------
2423

25-
alias_1
26-
~~~~~~~
24+
### alias_1
2725

2826
- Service: `service_1`
2927
- Public: yes
3028

31-
alias_2
32-
~~~~~~~
29+
### alias_2
3330

3431
- Service: `service_2`
3532
- Public: no

0 commit comments

Comments
 (0)