From 8d7134c8d37e08b1a737a02e6abca807d6220774 Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期五, 26 三月 2021 17:33:06 +0800
Subject: [PATCH] 冲突解决

---
 WebTM/WebTM.csproj.user |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index cf97e59..c147982 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>LAYUI</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
     <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>

--
Gitblit v1.9.1