Resolve merge conflicts from template integration

Author: AlisherAmonulloev

ASP.NET Core/Readme.md

@@ -6,9 +6,6 @@ Download the example and use Visual Studio 2022 (or later) or Visual Studio Code
 
 ## Client-side resources and bundling
 
-<<<<<<< HEAD
-This project uses [NPM](https://www.npmjs.com/) and [Gulp.js](https://gulpjs.com/) to install client-side libraries. The project restores NPM packages before the first build. Then, Gulp bundles required scripts and CSS files into the resulting package during the first and every next build. 
-=======
 This project uses [NPM](https://www.npmjs.com/) and [Gulp.js](https://gulpjs.com/) to install client-side libraries. The project restores NPM packages before the first build. Then, Gulp bundles required scripts and CSS files into the resulting package during the first and every next build.
 
 The project includes:
@@ -17,7 +14,6 @@ The project includes:
 - DevExtreme.AspNet.Data 5.*
 - jQuery 3.7.1
 - Bootstrap 5.3.3 
->>>>>>> template/25.1.2+
 
 The resulted bundles will be located in the `wwwroot` folder:
 * `css/vendor.css` - a file with all CSS styles.

ASP.NET Core/package-lock.json

@@ -4,10 +4,7 @@
   "private": true,
   "dependencies": {
     "jquery": "3.7.1",
-<<<<<<< HEAD
     "file-saver": "2.0.5",
-=======
->>>>>>> template/25.1.2+
     "devextreme-dist": "^24.2.3",
     "devextreme-aspnet-data": "^5.0.0",
     "bootstrap": "^5.3.3"

ASP.NET Core/package.json

@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-import {
-  useCallback, useEffect, useMemo, useState,
-} from 'react';
-=======
-import { useCallback, useState } from 'react';
->>>>>>> template/25.1.2+
 import './App.css';
 import 'devextreme/dist/css/dx.material.blue.light.compact.css';
 import FileUploader from 'devextreme-react/file-uploader';

React/src/App.tsx

@@ -2,7 +2,6 @@
   visibility: hidden;
 }
 
-<<<<<<< HEAD
 #message-box {
   display: none;
 }
@@ -42,9 +41,3 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-=======
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}
->>>>>>> template/25.1.2+