-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathmerge-30-08-16.txt
326 lines (326 loc) · 20.3 KB
/
merge-30-08-16.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
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
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
Removing spec/views/shared/_add_assignment_group.html.erb_spec.rb
Removing spec/views/quizzes/quizzes/_quiz_summary.html.erb_spec.rb
Removing spec/views/quizzes/quizzes/_question_statistic.html.erb_spec.rb
Removing spec/views/groups/_student.html.erb_spec.rb
Auto-merging spec/views/gradebooks/submissions_zip_upload.html.erb_spec.rb
Auto-merging spec/views/form_options_helper_spec.rb
Removing spec/views/files/new.html.erb_spec.rb
Removing spec/selenium/quizzes/quizzes_teacher_menu_tools_spec.rb
Auto-merging spec/selenium/outcomes/outcome_teacher_spec.rb
Auto-merging spec/selenium/outcomes/outcome_student_spec.rb
Auto-merging spec/selenium/outcomes/outcome_spec.rb
Auto-merging spec/selenium/outcomes/outcome_gradebook_spec.rb
Removing spec/selenium/manage_groups_students_spec.rb
Removing spec/selenium/helpers/testrail_report.rb
Removing spec/selenium/helpers/testrail.rb
Removing spec/selenium/grading_periods_account_spec.rb
Removing spec/selenium/assignments_menu_tools_spec.rb
Auto-merging spec/selenium/assignments/assignments_turn_it_in_spec.rb
Auto-merging spec/selenium/assignments/assignments_submissions_teacher_spec.rb
Auto-merging spec/selenium/assignments/assignments_submissions_teacher_groups_spec.rb
Auto-merging spec/selenium/assignments/assignments_submissions_student_spec.rb
Auto-merging spec/selenium/assignments/assignments_submissions_student_groups_spec.rb
Auto-merging spec/selenium/assignments/assignments_student_spec.rb
Auto-merging spec/selenium/assignments/assignments_student_observer_spec.rb
Auto-merging spec/selenium/assignments/assignments_spec.rb
Auto-merging spec/selenium/assignments/assignments_rubrics_spec.rb
Auto-merging spec/selenium/assignments/assignments_quizzes_spec.rb
Auto-merging spec/selenium/assignments/assignments_quick_add_spec.rb
Auto-merging spec/selenium/assignments/assignments_peer_reviews_spec.rb
Auto-merging spec/selenium/assignments/assignments_overrides_spec.rb
Auto-merging spec/selenium/assignments/assignments_multiple_grading_periods_spec.rb
Auto-merging spec/selenium/assignments/assignments_moderated_spec.rb
Auto-merging spec/selenium/assignments/assignments_group_spec.rb
Auto-merging spec/selenium/assignments/assignments_grading_type_spec.rb
Auto-merging spec/selenium/assignments/assignments_external_tool_spec.rb
Auto-merging spec/selenium/assignments/assignments_discussion_spec.rb
Removing spec/selenium/admin/account_admin_manage_groups_spec.rb
Removing spec/models/zip_file_import_spec.rb
Removing spec/models/inbox_item_spec.rb
Removing spec/models/grading_period/course_grading_period_finder_spec.rb
Removing spec/models/grading_period/account_grading_period_finder_spec.rb
Removing spec/migrations/psych_migration_spec.rb
Removing spec/lib/tour_spec.rb
Removing spec/javascripts/collections/RolesCollection.js
Auto-merging spec/helpers/grading_periods_helper_spec.rb
Auto-merging spec/factories/enrollment_term_factory.rb
Removing spec/controllers/tours_controller_spec.rb
Removing spec/coffeescripts/views/tours/AgendaTourSpec.coffee
Removing spec/coffeescripts/views/quiz_reports/QuizReportGeneratorSpec.coffee
Removing spec/coffeescripts/views/modules/ModuleItemViewRegisterSpec.coffee
Removing spec/coffeescripts/views/modules/ModuleCollectionViewSpec.coffee
Removing spec/coffeescripts/views/external_tools/IndexViewSpec.coffee
Removing spec/coffeescripts/views/external_tools/ExternalToolViewSpec.coffee
Removing spec/coffeescripts/views/external_tools/EditViewSpec.coffee
Removing spec/coffeescripts/views/external_tools/AppFullViewSpec.coffee
Removing spec/coffeescripts/views/external_tools/AddAppViewSpec.coffee
Removing spec/coffeescripts/views/conferences/EditConferenceViewSpec.coffee
Auto-merging spec/coffeescripts/tinymce_plugins/instructure_links/linkable_editorSpec.coffee
Removing spec/coffeescripts/react_files/components/ToolbarSpec.coffee
Removing spec/coffeescripts/react_files/components/ItemCogSpec.coffee
Removing spec/coffeescripts/react_files/components/FilePreviewSpec.coffee
Removing spec/coffeescripts/react_files/components/BreadcrumbsSpec.coffee
Removing spec/coffeescripts/react_files/TestLocation.coffee
Auto-merging spec/coffeescripts/quizzes/log_auditing/event_trackers/session_startedSpec.coffee
Auto-merging spec/coffeescripts/quizzes/log_auditing/event_trackers/question_viewedSpec.coffee
Auto-merging spec/coffeescripts/quizzes/log_auditing/event_trackers/page_blurredSpec.coffee
Auto-merging spec/coffeescripts/quizzes/log_auditing/event_managerSpec.coffee
Auto-merging spec/coffeescripts/quizzes/log_auditing/eventSpec.coffee
Removing spec/coffeescripts/jsx/shared/rce/rceStoreSpec.coffee
Removing spec/coffeescripts/jsx/gradebook/grid/helpers/datesHelperSpec.coffee
Removing spec/coffeescripts/jsx/external_apps/components/AppDetailsSpec.coffee
Removing spec/apis/v1/collaborator_json_spec.rb
Auto-merging public/locales/en.yml
CONFLICT (content): Merge conflict in public/locales/en.yml
Removing public/javascripts/wiki.js
Removing public/javascripts/vendor/usher/usher.js
Removing public/javascripts/vendor/usher/scrollIntoView.js
Removing public/javascripts/vendor/firebugx.js
Removing public/javascripts/site_admin.js
Removing public/javascripts/react-router.js
Removing public/javascripts/quiz_statistics.js
Removing public/javascripts/quiz_index.js
Removing public/javascripts/locale_converter.js
Removing public/javascripts/bower/react/JSXTransformer.js
Removing public/javascripts/bower/react-tray/specs/main.js
Removing public/javascripts/bower/react-tray/specs/helper.js
Removing public/javascripts/bower/react-tray/specs/Tray.spec.js
Removing public/javascripts/bower/react-tray/lib/helpers/classSet.js
Auto-merging public/javascripts/bower/react-tokeninput/src/main.js
Auto-merging public/javascripts/bower/react-tokeninput/src/combobox.js
Removing public/javascripts/bower/react-router/website/syntax.css
Removing public/javascripts/bower/react-router/website/styles.css
Removing public/javascripts/bower/react-router/website/index.html
Removing public/javascripts/bower/react-router/website/img/vertical.png
Removing public/javascripts/bower/react-router/website/img/horizontal.png
Removing public/javascripts/bower/react-router/website/img/arialText.png
Removing public/javascripts/bower/react-router/website/app.js
Removing public/javascripts/bower/react-router/tests.webpack.js
Removing public/javascripts/bower/react-router/doc/README.md
Removing public/javascripts/bower/react-router/doc/07 Misc/Transition.md
Removing public/javascripts/bower/react-router/doc/06 Mixins/State.md
Removing public/javascripts/bower/react-router/doc/06 Mixins/Navigation.md
Removing public/javascripts/bower/react-router/doc/05 Scroll Behaviors/ScrollToTopBehavior.md
Removing public/javascripts/bower/react-router/doc/05 Scroll Behaviors/ImitateBrowserBehavior.md
Removing public/javascripts/bower/react-router/doc/04 Locations/TestLocation.md
Removing public/javascripts/bower/react-router/doc/04 Locations/StaticLocation.md
Removing public/javascripts/bower/react-router/doc/04 Locations/RefreshLocation.md
Removing public/javascripts/bower/react-router/doc/04 Locations/HistoryLocation.md
Removing public/javascripts/bower/react-router/doc/04 Locations/HashLocation.md
Removing public/javascripts/bower/react-router/doc/04 Locations/Custom Location.md
Removing public/javascripts/bower/react-router/doc/03 Components/RouteHandler.md
Removing public/javascripts/bower/react-router/doc/03 Components/Route Handler.md
Removing public/javascripts/bower/react-router/doc/03 Components/Root.md
Removing public/javascripts/bower/react-router/doc/03 Components/Link.md
Removing public/javascripts/bower/react-router/doc/02 Top-Level/Router.run.md
Removing public/javascripts/bower/react-router/doc/02 Top-Level/Router.create.md
Removing public/javascripts/bower/react-router/doc/01 Route Configuration/Route.md
Removing public/javascripts/bower/react-router/doc/01 Route Configuration/Redirect.md
Removing public/javascripts/bower/react-router/doc/01 Route Configuration/NotFoundRoute.md
Removing public/javascripts/bower/react-router/doc/01 Route Configuration/DefaultRoute.md
Removing public/javascripts/bower/react-router/doc/00 Guides/Router Overview.md
Removing public/javascripts/bower/react-router/build/umd/ReactRouter.min.js
Removing public/javascripts/bower/react-router/build/umd/ReactRouter.js
Removing public/javascripts/bower/react-router/build/lib/supportsHistory.js
Removing public/javascripts/bower/react-router/build/lib/runRouter.js
Removing public/javascripts/bower/react-router/build/lib/locations/TestLocation.js
Removing public/javascripts/bower/react-router/build/lib/locations/StaticLocation.js
Removing public/javascripts/bower/react-router/build/lib/locations/RefreshLocation.js
Removing public/javascripts/bower/react-router/build/lib/locations/HistoryLocation.js
Removing public/javascripts/bower/react-router/build/lib/locations/HashLocation.js
Removing public/javascripts/bower/react-router/build/lib/isReactChildren.js
Removing public/javascripts/bower/react-router/build/lib/index.js
Removing public/javascripts/bower/react-router/build/lib/getWindowScrollPosition.js
Removing public/javascripts/bower/react-router/build/lib/createRoutesFromReactChildren.js
Removing public/javascripts/bower/react-router/build/lib/createRouter.js
Removing public/javascripts/bower/react-router/build/lib/components/RouteHandler.js
Removing public/javascripts/bower/react-router/build/lib/components/Route.js
Removing public/javascripts/bower/react-router/build/lib/components/Redirect.js
Removing public/javascripts/bower/react-router/build/lib/components/NotFoundRoute.js
Removing public/javascripts/bower/react-router/build/lib/components/Link.js
Removing public/javascripts/bower/react-router/build/lib/components/DefaultRoute.js
Removing public/javascripts/bower/react-router/build/lib/components/ContextWrapper.js
Removing public/javascripts/bower/react-router/build/lib/components/ActiveHandler.js
Removing public/javascripts/bower/react-router/build/lib/behaviors/ScrollToTopBehavior.js
Removing public/javascripts/bower/react-router/build/lib/behaviors/ImitateBrowserBehavior.js
Removing public/javascripts/bower/react-router/build/lib/actions/LocationActions.js
Removing public/javascripts/bower/react-router/build/lib/Transition.js
Removing public/javascripts/bower/react-router/build/lib/TestUtils.js
Removing public/javascripts/bower/react-router/build/lib/State.js
Removing public/javascripts/bower/react-router/build/lib/ScrollHistory.js
Removing public/javascripts/bower/react-router/build/lib/Route.js
Removing public/javascripts/bower/react-router/build/lib/Redirect.js
Removing public/javascripts/bower/react-router/build/lib/PropTypes.js
Removing public/javascripts/bower/react-router/build/lib/PathUtils.js
Removing public/javascripts/bower/react-router/build/lib/Navigation.js
Removing public/javascripts/bower/react-router/build/lib/Match.js
Removing public/javascripts/bower/react-router/build/lib/History.js
Removing public/javascripts/bower/react-router/build/lib/Cancellation.js
Removing public/javascripts/bower/react-router/build/README.md
Removing public/javascripts/bower/react-router/bower.json
Removing public/javascripts/bower/react-router/UPGRADE_GUIDE.md
Removing public/javascripts/bower/react-router/README.md
Removing public/javascripts/bower/react-router/LICENSE
Removing public/javascripts/bower/react-router/CHANGELOG.md
Removing public/javascripts/bower/react-router/.bower.json
Removing public/javascripts/bower/moment/locale/mi-nz.js
Removing public/javascripts/assignments.js
Removing public/javascripts/add_assignment_group.js
Removing public/images/svg-icons/svg_commons_logo.svg
Removing public/images/sso_buttons/sso-scim.svg
Removing public/images/sso_buttons/sso-fb.svg
Auto-merging public/ie-9-is-not-supported.html
Removing public/fonts/icons/tour-step-counter.svg
Removing public/fonts/icons/tour-info.svg
Removing lib/tour.rb
Removing lib/send_to_inbox.rb
Removing lib/data_fixup/psych_migration.rb
Auto-merging lib/canvas/plugins/validators/mathman_validator.rb
Auto-merging lib/canvas/plugins/validators/i18n_validator.rb
Auto-merging lib/canvas/help.rb
CONFLICT (content): Merge conflict in lib/canvas/help.rb
Removing lib/bulk_bounce_count_resetter.rb
Auto-merging lib/api/v1/collaboration.rb
Auto-merging gems/rubocop-canvas/lib/rubocop_canvas/cops/specs/no_before_all.rb
Auto-merging gems/rubocop-canvas/lib/rubocop_canvas/cops/specs/ensure_spec_extension.rb
Removing gems/rubocop-canvas/lib/rubocop_canvas/cops/lint/specs_rm_rf.rb
Removing gems/rubocop-canvas/lib/rubocop_canvas/cops/lint/specs_helper_modules.rb
Removing gems/rubocop-canvas/lib/rubocop_canvas/cops/lint/specs_f_over_fj.rb
Removing gems/rubocop-canvas/lib/rubocop_canvas/cops/lint/specs_execute_script.rb
Removing gems/rubocop-canvas/lib/rubocop_canvas/cops/datafixup/find_ids.rb
Removing frontend_build/brandableCss.js
Removing db/migrate/20110825214829_question_data_length.rb
Removing config/tours.rb
Auto-merging config/routes.rb
Auto-merging config/locales/generated/en.yml
CONFLICT (content): Merge conflict in config/locales/generated/en.yml
Auto-merging config/locales/en-GB.yml
CONFLICT (content): Merge conflict in config/locales/en-GB.yml
Auto-merging config/locales/en-AU.yml
CONFLICT (content): Merge conflict in config/locales/en-AU.yml
Removing config/initializers/tour.rb
Removing config/initializers/sqlite_savepoint.rb
Removing client_apps/canvas_quizzes/vendor/packages/react.js
Removing client_apps/canvas_quizzes/vendor/packages/react-router.js
Auto-merging client_apps/canvas_quizzes/vendor/js/old_version_of_react-router_used_by_canvas_quizzes_client_apps.js
Removing app/views/zip_file_imports/new.html.erb
Removing app/views/shared/svg/_svg_icon_scim.svg
Removing app/views/shared/svg/_svg_commons_logo.svg
Removing app/views/shared/_zip_file_import_form.html.erb
Removing app/views/shared/_add_assignment_group.html.erb
Removing app/views/search/query.html.erb
Removing app/views/role_overrides/_permission.html.erb
Removing app/views/quizzes/quizzes/_quiz_summary.html.erb
Removing app/views/quizzes/quizzes/_question_statistic.html.erb
Removing app/views/profile/show_limited.html.erb
Removing app/views/profile/_secondary_nav.html.erb
Auto-merging app/views/login/canvas/new.html.erb
Auto-merging app/views/login/canvas/_new_login_content.html.erb
Auto-merging app/views/layouts/application.html.erb
Removing app/views/jst/tours/QuizRegrade.handlebars
Removing app/views/jst/tours/AgendaTour.handlebars
Removing app/views/jst/quiz_reports/quizReportGenerator.handlebars
Removing app/views/jst/modules/item_types/SelectFileView.handlebars
Removing app/views/jst/modules/ModuleView.handlebars
Removing app/views/jst/modules/ModuleItemView.handlebars
Removing app/views/jst/modules/ModuleItemCollectionView.handlebars
Removing app/views/jst/modules/ModuleCollectionView.handlebars
Removing app/views/jst/modules/AddModuleItemDialogWrapper.handlebars
Removing app/views/jst/modules/AddModuleItemDialog.handlebars
Removing app/views/jst/ExternalTools/RateToolView.handlebars
Removing app/views/jst/ExternalTools/IndexView.handlebars
Removing app/views/jst/ExternalTools/ExternalToolsCollectionView.handlebars
Removing app/views/jst/ExternalTools/ExternalToolView.handlebars
Removing app/views/jst/ExternalTools/EditView.handlebars
Removing app/views/jst/ExternalTools/AppThumbnailView.handlebars
Removing app/views/jst/ExternalTools/AppReviewView.handlebars
Removing app/views/jst/ExternalTools/AppFullView.handlebars
Removing app/views/jst/ExternalTools/AppCenterView.handlebars
Removing app/views/jst/ExternalTools/AddAppView.handlebars
Removing app/views/index.html.erb
Removing app/views/groups/_student.html.erb
Removing app/views/gradebooks/unknown_page_js.html.erb
Removing app/views/files/text_show.html.erb
Removing app/views/files/new.html.erb
Removing app/views/files/_folder.html.erb
Removing app/views/files/_fields.html.erb
Removing app/views/files/_content_folder.html.erb
Removing app/views/eportfolios/private_portfolio.html.erb
Removing app/views/discussion_topics/_group_assignment_discussion_entry.html.erb
Removing app/views/courses/_user_box.html.erb
Removing app/views/courses/_enrollment_reminders.html.erb
Removing app/views/content_imports/files.html.erb
Auto-merging app/views/communication_channels/confirm.html.erb
Removing app/views/assignments/show_locked.html.erb
Removing app/views/assignments/_group_weights.html.erb
Removing app/views/assignments/_embedded_rubric.html.erb
Removing app/views/announcements/_external_feed.html.erb
Auto-merging app/stylesheets/pages/login/_login_legacy.scss
CONFLICT (content): Merge conflict in app/stylesheets/pages/login/_login_legacy.scss
Removing app/stylesheets/components/_tour-popovers.scss
Auto-merging app/stylesheets/bundles/syllabus.scss
Removing app/stylesheets/bundles/context_modules.scss
Removing app/models/zip_file_import.rb
Removing app/models/inbox_item.rb
Removing app/jsx/theme_editor/SharedBrandConfigPicker.jsx
Removing app/jsx/shared/rce/rceStore.jsx
Removing app/jsx/gradebook/grid/helpers/datesHelper.jsx
Removing app/jsx/external_apps/routes.jsx
Removing app/controllers/zip_file_imports_controller.rb
Removing app/controllers/tours_controller.rb
Auto-merging app/controllers/login/microsoft_controller.rb
Removing app/coffeescripts/views/tours/QuizRegrade.coffee
Removing app/coffeescripts/views/tours/AgendaTour.coffee
Removing app/coffeescripts/views/quiz_reports/QuizReportGenerator.coffee
Removing app/coffeescripts/views/modules/item_types/SelectFileView.coffee
Removing app/coffeescripts/views/modules/ModuleView.coffee
Removing app/coffeescripts/views/modules/ModuleItemViewRegister.coffee
Removing app/coffeescripts/views/modules/ModuleItemView.coffee
Removing app/coffeescripts/views/modules/ModuleItemTypes.coffee
Removing app/coffeescripts/views/modules/ModuleItemCollectionView.coffee
Removing app/coffeescripts/views/modules/ModuleCollectionView.coffee
Removing app/coffeescripts/views/modules/AddModuleItemDialog.coffee
Removing app/coffeescripts/views/TourView.coffee
Removing app/coffeescripts/views/ExternalTools/RateToolView.coffee
Removing app/coffeescripts/views/ExternalTools/IndexView.coffee
Removing app/coffeescripts/views/ExternalTools/ExternalToolsCollectionView.coffee
Removing app/coffeescripts/views/ExternalTools/ExternalToolView.coffee
Removing app/coffeescripts/views/ExternalTools/EditView.coffee
Removing app/coffeescripts/views/ExternalTools/AppThumbnailView.coffee
Removing app/coffeescripts/views/ExternalTools/AppReviewView.coffee
Removing app/coffeescripts/views/ExternalTools/AppFullView.coffee
Removing app/coffeescripts/views/ExternalTools/AppCenterView.coffee
Removing app/coffeescripts/views/ExternalTools/AddAppView.coffee
Removing app/coffeescripts/util/wikiSidebarWithMultipleEditors.coffee
Removing app/coffeescripts/tours.coffee
Removing app/coffeescripts/react_files/utils/forceScreenreaderToReparse.coffee
Removing app/coffeescripts/react_files/routes.coffee
Removing app/coffeescripts/react_files/components/BreadcrumbCollapsedContainer.coffee
Removing app/coffeescripts/react/shared/utils/withReactDOM.coffee
Removing app/coffeescripts/models/QuizReport.coffee
Removing app/coffeescripts/models/AppReview.coffee
Removing app/coffeescripts/collections/ExternalToolCollection.coffee
Removing app/coffeescripts/calendar/CalendarLocaleConverter.coffee
Removing app/coffeescripts/bundles/zip_file_imports.coffee
Removing app/coffeescripts/bundles/tool_inline.coffee
Removing app/coffeescripts/bundles/teach_activity_report.coffee
Removing app/coffeescripts/bundles/site_admin.coffee
Removing app/coffeescripts/bundles/quizzes_index_legacy.coffee
Removing app/coffeescripts/bundles/quiz_statistics.coffee
Removing app/coffeescripts/bundles/notifications.coffee
Auto-merging app/coffeescripts/bundles/license_help.coffee
Removing app/coffeescripts/bundles/legacy/wiki_pages_content.coffee
Removing app/coffeescripts/bundles/legacy/files_full_index.coffee
Removing app/coffeescripts/bundles/legacy/edit_rubric_user_index.coffee
Removing app/coffeescripts/bundles/legacy/courses_course_wizard_box.coffee
Removing app/coffeescripts/bundles/legacy/content_imports_files.coffee
Removing app/coffeescripts/bundles/jquery_ui_menu.coffee
Removing app/coffeescripts/bundles/global_assignments.coffee
Removing app/coffeescripts/bundles/external_tools.coffee
Removing app/coffeescripts/bundles/context_modules2.coffee
Removing app/coffeescripts/bundles/assignments.coffee
Removing app/coffeescripts/bundles/assignmentMuter.coffee
Removing app/coffeescripts/bundles/add_assignment_group.coffee
Removing app/coffeescripts/ModuleItemTypes.coffee
Removing Gemfile.d/mysql.rb
Automatic merge failed; fix conflicts and then commit the result.