Commit 5bb7c16
committed
support merge models
Signed-off-by: David BRAQUART <[email protected]>1 parent 599a139 commit 5bb7c16
File tree
1 file changed
+2
-0
lines changed- src/main/java/org/gridsuite/studyconfig/server/service
1 file changed
+2
-0
lines changedLines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
178 | 178 | | |
179 | 179 | | |
180 | 180 | | |
| 181 | + | |
| 182 | + | |
181 | 183 | | |
182 | 184 | | |
183 | 185 | | |
| |||
0 commit comments