Commit b396403
committed
Merge branch '7.0' into 7.1
# Conflicts:
# Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/DriverFactory.cs
# Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v3_0/Extractor.cs
# Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v3_0/Translator.cs
# Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v3_0/TypeMapper.cs
# Orm/Xtensive.Orm.Tests.Framework/Orm.config
# Orm/Xtensive.Orm.Tests/Issues/IssueJira0208_IncorrectUpgradeSequence/UpgradeTest.cs2 files changed
Lines changed: 4 additions & 4 deletions
File tree
- Orm
- Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v3_0
- Xtensive.Orm.Tests.Sql
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
86 | | - | |
87 | | - | |
88 | | - | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
| |||
0 commit comments