Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/chomado/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	VoiceTextWebAPI.Client/Format.cs
  • Loading branch information
jsakamoto committed Mar 15, 2018
2 parents d7661d4 + ea6f843 commit adc436a
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion VoiceTextWebAPI.Client/Format.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ public enum Format
{
WAV,
OGG,
AAC,
MP3
}
}

0 comments on commit adc436a

Please sign in to comment.