hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing merge conflicts

Browse source
This commit is contained in:
Jade Rowland 2023-12-10 11:24:39 -05:00
parent c4fe664215
commit 4d361a2b3d
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
website/src/repl/Footer.jsx
View file

@ -10,7 +10,6 @@ import { useSettings, settingsMap, setActiveFooter, defaultSettings } from '../s
import { getAudioContext, soundMap } from '@strudel.cycles/webaudio'; import { getAudioContext, soundMap } from '@strudel.cycles/webaudio';
import { useStore } from '@nanostores/react'; import { useStore } from '@nanostores/react';
import { FilesTab } from './FilesTab'; import { FilesTab } from './FilesTab';
import ImportSoundsButton from './ImportSoundsButton';
const TAURI = window.__TAURI__; const TAURI = window.__TAURI__;
@ -254,7 +253,6 @@ function SoundsTab() {
user: 'User', user: 'User',
}} }}
></ButtonGroup> ></ButtonGroup>
<ImportSoundsButton onComplete={() => settingsMap.setKey('soundsFilter', 'user')} />
</div> </div>
<div className="p-2 min-h-0 max-h-full grow overflow-auto font-mono text-sm break-normal"> <div className="p-2 min-h-0 max-h-full grow overflow-auto font-mono text-sm break-normal">
{soundEntries.map(([name, { data, onTrigger }]) => ( {soundEntries.map(([name, { data, onTrigger }]) => (