Skip to content

Commit 9d393ec

Browse files
[UPMERGE] 1.7 -> 2.0 (Sylius#422)
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/PayPalPlugin/blob/1.7/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout <this-pr-number> git merge upstream/2.0 -m "Resolve conflicts between 1.7 and 2.0" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/PayPalPlugin` repository. Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
2 parents 64b1b56 + 3e47de2 commit 9d393ec

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

.gitattributes

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/.github export-ignore
2+
/etc export-ignore
3+
/spec export-ignore
4+
/tests/DataFixtures export-ignore
5+
/tests/DependencyInjection export-ignore
6+
/tests/Integration export-ignore
7+
/tests/Service export-ignore
8+
/tests/TestApplication export-ignore
9+
/tests/Unit export-ignore
10+
.editorconfig export-ignore
11+
.gitattributes export-ignore
12+
.gitignore export-ignore
13+
behat.yml.dist export-ignore
14+
ecs.php export-ignore
15+
node_modules export-ignore
16+
phpstan.neon.dist export-ignore
17+
phpunit.xml.dist export-ignore
18+
rector.php export-ignore
19+
symfony.lock export-ignore

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/.phpunit.result.cache
1010
/behat.yml
11-
/phpspec.yml
1211
/phpunit.xml
1312

1413
/tests/TestApplication/.env.local

0 commit comments

Comments
 (0)