Remove server worker registration from default templates (facebook#9349)

Author: iansu

packages/cra-template/template/src/index.js

@@ -3,7 +3,6 @@ import ReactDOM from "react-dom"
 import "typeface-roboto"
 import App from "./App"
 import ErrorBoundary from "./ErrorBoundary"
-import * as serviceWorkerRegistration from './serviceWorkerRegistration';
 import reportWebVitals from './reportWebVitals';
 
 const Root = () => (
@@ -16,11 +15,6 @@ const Root = () => (
 
 ReactDOM.render(<Root />, document.getElementById("root"))
 
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://cra.link/PWA
-serviceWorkerRegistration.unregister();
-
 // If you want to start measuring performance in your app, pass a function
 // to log results (for example: reportWebVitals(console.log))
 // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals

packages/cra-template/template/src/serviceWorkerRegistration.js

@@ -1,6 +1,4 @@
-<<<<<<< HEAD
 /* eslint-disable */
-=======
 // This optional code is used to register a service worker.
 // register() is not called by default.
 
@@ -13,7 +11,6 @@
 // To learn more about the benefits of this model and instructions on how to
 // opt-in, read https://cra.link/PWA
 
->>>>>>> 9123aae7 (Move shortlinks to cra.link (#8957))
 const isLocalhost = Boolean(
   window.location.hostname === "localhost" ||
     // [::1] is the IPv6 localhost address.
@@ -46,17 +43,10 @@ export function register(config) {
         // service worker/PWA documentation.
         navigator.serviceWorker.ready.then(() => {
           console.log(
-<<<<<<< HEAD
-            "This web app is being served cache-first by a service " +
-              "worker. To learn more, visit https://bit.ly/CRA-PWA"
-          )
-        })
-=======
             'This web app is being served cache-first by a service ' +
               'worker. To learn more, visit https://cra.link/PWA'
           );
         });
->>>>>>> 9123aae7 (Move shortlinks to cra.link (#8957))
       } else {
         // Is not localhost. Just register service worker
         registerValidSW(swUrl, config)