Skip to content

Commit 6b994ff

Browse files
committed
Fixed layout
2 parents 1f821bf + 21aed67 commit 6b994ff

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

files/apsync/video.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,11 @@ <h1>Video Streaming</h1>
152152

153153
var form_quality = "form_quality" + i;
154154
var quality_select_box = "quality_select_box"+i;
155+
<<<<<<< HEAD
155156
var set_quality_button = "set_quality_button"+i;
157+
=======
158+
var set_quality_button = "set_quality_button"+i;copy_clipboard
159+
>>>>>>> backup_branch
156160
var record_video_checkbox = "record"+i;
157161

158162
var current_quality = rowdata.current_quality;

0 commit comments

Comments
 (0)