seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

One more merge artifact.

This commit is contained in:
Steven Miers 2014-11-03 18:38:06 -06:00
parent 2400a8869e
commit df9352d608
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pb/src/client_container.proto
View File

@ -484,7 +484,6 @@ message RecordingMasterMixComplete {
optional string notification_id = 4;
optional string created_at = 5;
optional string claimed_recording_id = 6;
<<<<<<< HEAD
}
message RecordingStreamMixComplete {
@ -494,8 +493,6 @@ message RecordingStreamMixComplete {
optional string notification_id = 4;
optional string created_at = 5;
optional string claimed_recording_id = 6;
=======
>>>>>>> feature/video_mvp
}
message DownloadAvailable {