Commit 70d20f6
Revert cache.py typo fix to match master and eliminate 3-way merge conflict
Agent-Logs-Url: https://github.com/saltstack/salt/sessions/73f94533-3b5b-4a2f-ac93-095b91dbeb66
Co-authored-by: dwoz <1527763+dwoz@users.noreply.github.com>1 parent 7b40692 commit 70d20f6
1 file changed
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
270 | 270 | | |
271 | 271 | | |
272 | 272 | | |
273 | | - | |
274 | | - | |
| 273 | + | |
| 274 | + | |
275 | 275 | | |
276 | | - | |
| 276 | + | |
277 | 277 | | |
278 | 278 | | |
279 | 279 | | |
| |||
0 commit comments