fix merge conflict

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

View file

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

View file

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

1750
package-lock.json generated

File diff suppressed because it is too large Load diff