r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Cassie Tarakajian 2018-08-21 15:39:01 -04:00
commit 63fe883528
3 changed files with 903 additions and 851 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/modules/IDE/components/About.jsx
View file

@ -72,7 +72,7 @@ function About(props) {
</p> </p>
<p className="about__content-column-list"> <p className="about__content-column-list">
<a <a
href="https://forum.processing.org/two/" href="https://discourse.processing.org/"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
> >

2
client/utils/previewEntry.js
View file

@ -1,5 +1,5 @@
import loopProtect from 'loop-protect'; import loopProtect from 'loop-protect';
import Hook from 'console-feed/lib/Hook/index'; import { Hook } from 'console-feed';
window.loopProtect = loopProtect; window.loopProtect = loopProtect;

1750
package-lock.json generated
View file

File diff suppressed because it is too large Load diff