Something went wrong while fetching comments. Please try again.
packages/react-scripts/template/src
App.js +1 -3
CounterClass.js +4 -1
CounterFunction.js +3 -1
Hello.js +6 -5
hot.js +14 -11
index.js +2 -0
- Dan Abramov authored
Conflict: This file was modified in the source branch, but removed in the target branch.
Ask someone with write access to resolve it.
@@ -3,8 +3,6 @@ import Hello from './Hello';
@@ -12,6 +10,6 @@ let App = window.__assign(module, 'App', function App({ children }) {
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
@@ -28,3 +28,6 @@ export default class Counter extends Component {
@@ -2,7 +2,7 @@ import React, { Suspense, lazy, useState } from 'react';
@@ -13,14 +13,12 @@ let HCF;
@@ -54,6 +52,9 @@ HCC = window.__assign(module, 'HCC', HOCClass(CounterClass, 'red'));
@@ -257,12 +269,3 @@ window.__assign = function(webpackModule, localId, nextRawType) {
Conflict: This file was modified in the source branch, but removed in the target branch.
Ask someone with write access to resolve it.
@@ -12,6 +12,8 @@ ReactDOM.render(