|
|
@@ -173,13 +173,10 @@ Global
|
|
|
{3AB75B51-A69D-4145-A564-1D9D1695992E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
|
{3AB75B51-A69D-4145-A564-1D9D1695992E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
|
{3AB75B51-A69D-4145-A564-1D9D1695992E}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
{91CD58E7-C314-43FD-BC64-D47F7537833F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
|
{91CD58E7-C314-43FD-BC64-D47F7537833F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
|
{91CD58E7-C314-43FD-BC64-D47F7537833F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
|
{91CD58E7-C314-43FD-BC64-D47F7537833F}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
|
->>>>>>> feature/exam
|
|
|
{6A4399E0-6816-3A7F-3442-EE5BFB0076F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
|
{6A4399E0-6816-3A7F-3442-EE5BFB0076F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
|
{6A4399E0-6816-3A7F-3442-EE5BFB0076F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
guqiang