Fix CHANGELOG conflicts again. (368c5758) · Commits · Hsin-Yu Chien / edx-platform-release · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

368c5758

Commit 368c5758 authored 11 years ago by Ned Batchelder

Downloads
- Plain Diff

Fix CHANGELOG conflicts again.

parents 9a106a32 ceb15209

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

common/lib/xmodule/xmodule/js/spec/video/general_spec.js 2 additions, 12 deletions

common/lib/xmodule/xmodule/js/spec/video/general_spec.js
common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js 6 additions, 36 deletions

...n/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js 4 additions, 24 deletions

...odule/xmodule/js/spec/video/video_progress_slider_spec.js

with 12 additions and 72 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment