Commit 21ee952
authored
Remove duplicate definitions in ghe-backup-config (#480)
While investigating an unrelated issue, I noticed that some definitions
in ghe-backup-config are present twice. The reason for this appears to
be a faulty merge conflict resolution [1], as both parent commits [2, 3]
only have a single copy of these definitions but the merge commit has
duplicates. It seems that an unwieldy conflict came up while merging the
progress-indicator with the master branch, as a result of which both the
old and new locations of these definitions were accidentally kept,
causing the duplication.
This removes one copy of each definition to avoid confusion and
potential future bugs.
[1] 1eaf809
[2] a8e7eca
[3] 8aaccc31 parent 56e88a9 commit 21ee952
File tree
1 file changed
+1
-37
lines changed1 file changed
+1
-37
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
| 38 | + | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | 54 | | |
59 | 55 | | |
60 | 56 | | |
| |||
150 | 146 | | |
151 | 147 | | |
152 | 148 | | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | 149 | | |
183 | 150 | | |
184 | 151 | | |
| |||
187 | 154 | | |
188 | 155 | | |
189 | 156 | | |
190 | | - | |
191 | | - | |
192 | | - | |
193 | 157 | | |
194 | 158 | | |
195 | 159 | | |
| |||
0 commit comments