diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #18169 Fix leftover conflict marker in UPGRADE-3.0.md (guilliamxavier)

Browse Source 
This PR was merged into the 3.0 branch.

Discussion
----------

Fix leftover conflict marker in UPGRADE-3.0.md

| Q             | A
| ------------- | ---
| Branch        | 3.0
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   |
| Fixed tickets |
| License       | MIT
| Doc PR        |

Presumably after resolving a merge conflict, a parasite line `>>>>>>> 2.8` was introduced as part of commit 67df429d99:
* 67df429d99 (diff-0901ceb76939b17cd920bc69aa52d21fR406)
* 67df429d99/UPGRADE-3.0.md (L406)

The present PR just deletes this line 406.

Commits
-------

b47220a Fix leftover conflict marker in UPGRADE-3.0.md
This commit is contained in:
Fabien Potencier 2016-03-15 06:56:54 +01:00
commit b120697f4c
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UPGRADE-3.0.md
View File

@ -403,7 +403,6 @@ UPGRADE FROM 2.x to 3.0
* The `choice_list` option of `ChoiceType` was removed.
>>>>>>> 2.8
* The option "precision" was renamed to "scale".
Before: