Merge branch 'master' of https://github.com/create-go-app/net_http-go-template

Author: koddr

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Vic Shóstak <vikkyshostak@gmail.com> (https://shostak.dev)
+   Copyright 2021 Vic Shóstak and Create Go App Contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,6 +1,10 @@
 # net/http backend template for [Create Go App CLI](https://github.com/create-go-app/cli)
 
+<<<<<<< HEAD
 <img src="https://img.shields.io/badge/Go-1.17+-00ADD8?style=for-the-badge&logo=go" alt="go version" />&nbsp;<a href="https://goreportcard.com/report/github.com/create-go-app/net_http-go-template" target="_blank"><img src="https://img.shields.io/badge/Go_report-A+-success?style=for-the-badge&logo=none" alt="go report" /></a>&nbsp;<img src="https://img.shields.io/badge/license-mit-red?style=for-the-badge&logo=none" alt="license" />
+=======
+<img src="https://img.shields.io/badge/Go-1.16+-00ADD8?style=for-the-badge&logo=go" alt="go version" />&nbsp;<a href="https://goreportcard.com/report/github.com/create-go-app/net_http-go-template" target="_blank"><img src="https://img.shields.io/badge/Go_report-A+-success?style=for-the-badge&logo=none" alt="go report" /></a>&nbsp;<img src="https://img.shields.io/badge/license-Apache_2.0-red?style=for-the-badge&logo=none" alt="license" />
+>>>>>>> 3906d3df2780abf75d5a813a320ea925a5d6fc6e
 
 Package `net` provides a portable interface for network I/O, including TCP/IP, UDP, domain name resolution, and Unix domain sockets. Although the package provides access to low-level networking primitives.
 
@@ -39,7 +43,11 @@ make docker.run
 
 | Name                                                                  | Version   | Type       |
 | --------------------------------------------------------------------- | --------- | ---------- |
+<<<<<<< HEAD
 | [net/http](https://golang.org/pkg/net/http/)                          | `latest`  | core       |
+=======
+| [net/http](https://golang.org/pkg/net/http/)                          | `v1.17.0` | core       |
+>>>>>>> 3906d3df2780abf75d5a813a320ea925a5d6fc6e
 | [gorilla/mux](https://github.com/gorilla/mux)                         | `v1.8.0`  | router     |
 | [auth0/go-jwt-middleware](https://github.com/auth0/go-jwt-middleware) | `v1.0.1`  | middleware |
 | [swaggo/http-swagger](https://github.com/swaggo/http-swagger)         | `v1.1.1`  | middleware |