diff options
| author | Andrew Kim <andrewdkim@users.noreply.github.com> | 2019-03-16 18:25:06 -0400 |
|---|---|---|
| committer | Andrew Kim <andrewdkim@users.noreply.github.com> | 2019-03-16 18:25:06 -0400 |
| commit | 07f7eb81e2eb9b28369c83d02a63e77d5ece14bf (patch) | |
| tree | 3d1c50b5f1a7b4ba496fbf189b9d2d3f3fd89de3 /src | |
| parent | f8a2744ea03ec03236284939d14787b04b9c8aa6 (diff) | |
| parent | 98dff6ca1915ef006e13532f593219c9bc4ccc97 (diff) | |
merge conflicts resolved
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/Main.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx index 9f341b0ed..d73e9b8fe 100644 --- a/src/client/views/Main.tsx +++ b/src/client/views/Main.tsx @@ -104,7 +104,7 @@ Documents.initProtos(mainDocId, (res?: Document) => { <div className="main-buttonDiv" style={{ bottom: '125px' }} > <button onClick={clearDatabase}>Clear Database</button></div> <div className="main-buttonDiv" style={{ bottom: '175px' }} ref={videoRef}> - <button onPointerDown={setupDrag(videoRef, addVideoNode)} onClick={addClick(addVideoNode)}>Add qewfadsfasdfa</button></div> + <button onPointerDown={setupDrag(videoRef, addVideoNode)} onClick={addClick(addVideoNode)}>Add Video</button></div> <div className="main-buttonDiv" style={{ bottom: '200px' }} ref={audioRef}> <button onPointerDown={setupDrag(audioRef, addAudioNode)} onClick={addClick(addAudioNode)}>Add Audio</button></div> <div className="main-buttonDiv" style={{ bottom: '150px' }} ref={pdfRef}> |