Commit 7067c3d
committed
Remove redundancy post merge conflict resolved
Signed-off-by: Craig Perkins <[email protected]>1 parent ea30a61 commit 7067c3d
File tree
2 files changed
+0
-4
lines changed- src/main/java/org/opensearch/security/resources
2 files changed
+0
-4
lines changedLines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
80 | | - | |
81 | | - | |
82 | 80 | | |
83 | 81 | | |
84 | 82 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | | - | |
61 | | - | |
62 | 60 | | |
63 | 61 | | |
64 | 62 | | |
| |||
0 commit comments