mirror/gradio
2
0
Fork 0
mirror of https://github.com/gradio-app/gradio.git synced 2025-03-31 12:20:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
dawoodkhan82 2022-01-26 22:01:07 -05:00
parent 788bb15a40
commit 413ae00549
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
demo/kitchen_sink/run.py
View File

@ -118,12 +118,8 @@ iface = gr.Interface(
gr.outputs.Audio(label="Audio"),
gr.outputs.Image(label="Image"),
gr.outputs.Video(label="Video"),
<<<<<<< HEAD
gr.outputs.HighlightedText(label="HighlightedText", color_map={"punc": "pink", "test 0": "blue"}),
=======
gr.outputs.HighlightedText(label="HighlightedText", color_map={
"punc": "pink", "test 0": "blue"}),
>>>>>>> master
gr.outputs.HighlightedText(label="HighlightedText", show_legend=True),
gr.outputs.JSON(label="JSON"),
gr.outputs.HTML(label="HTML"),
@ -135,10 +131,6 @@ iface = gr.Interface(
x="time", y=["price", "value"], label="Timeseries"),
],
examples=[
<<<<<<< HEAD
["the quick brown fox", "jumps over the lazy dog", 10, 12, 4, True, ["foo", "baz"], "baz", "bar", "files/cheetah1.jpg", "files/cheetah1.jpg", "files/cheetah1.jpg", "files/cheetah1.jpg", "files/world.mp4", "files/cantina.wav", "files/cantina.wav","files/titanic.csv", [[1,2,3],[3,4,5]], "files/time.csv"]
] * 3,
=======
[
"the quick brown fox",
"jumps over the lazy dog",
@ -163,7 +155,6 @@ iface = gr.Interface(
]
* 3,
theme="default",
>>>>>>> master
title="Kitchen Sink",
theme="default",
description="Try out all the components!",

5
demo/reverse_audio/run.py
View File

@ -7,12 +7,7 @@ def reverse_audio(audio):
sr, data = audio
return (sr, np.flipud(data))
<<<<<<< HEAD
iface = gr.Interface(reverse_audio, "audio", "audio", examples="audio")
=======
iface = gr.Interface(reverse_audio, "microphone", "audio", examples="audio")
>>>>>>> master
if __name__ == "__main__":
iface.launch()