10 lines
498 B
Plaintext
10 lines
498 B
Plaintext
|
diff a/佳典/WeeeCarbonFootprint.csproj b/佳典/WeeeCarbonFootprint.csproj (rejected hunks)
|
||
|
|
@@ -1026,6 +1026,7 @@
|
||
|
|
<Content Include="Content\fancybox\README.md" />
|
||
|
|
<Content Include="Content\fancybox\sprite.psd" />
|
||
|
|
<Content Include="Areas\Certification\Views\Comment\Index.cshtml" />
|
||
|
|
++<<<<<<< Updated upstream
|
||
|
|
+ <Content Include="Areas\Certification\Views\Parameter\Remark.cshtml" />
|
||
|
|
+ <Content Include="Areas\Certification\Views\Parameter\NonYearly.cshtml" />
|
||
|
|
+=======
|