Commit 5922bf4
authored
Fix CI caused by a silent merge conflict (apache#3665)
1 parent f954a72 commit 5922bf4
1 file changed
Lines changed: 2 additions & 2 deletions
File tree
- parquet-plugins/parquet-encoding-vector/src/test/java/org/apache/parquet/column/values/bitpacking
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
113 | | - | |
| 113 | + | |
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
| |||
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
141 | | - | |
| 141 | + | |
142 | 142 | | |
143 | 143 | | |
144 | 144 | | |
| |||
0 commit comments