Commit 24d053a
committed
Merge branch 'ticket/OPP-102' of https://github.com/oroinc/oro-phpstorm-plugin
# Conflicts:
# src/main/resources/META-INF/plugin.xml2 files changed
Lines changed: 4 additions & 1 deletion
File tree
- src/main
- java/com/oroplatform/idea/oroplatform/schema
- resources/META-INF
Lines changed: 3 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
898 | 898 | | |
899 | 899 | | |
900 | 900 | | |
901 | | - | |
| 901 | + | |
| 902 | + | |
| 903 | + | |
902 | 904 | | |
903 | 905 | | |
904 | 906 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
| |||
0 commit comments