diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-04-23 18:24:10 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-04-23 18:24:10 +0300 |
| commit | 8438e5447b6bed6ed97f2e3fda6977ce4bf74d0c (patch) | |
| tree | 4efca7fbcdbb241ac3760e372dda75f99638dde0 /Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Tango.Scripting.Basic.csproj | |
| parent | f48d6b6714c3115c3b2031e84b85a9fa7442c40f (diff) | |
| parent | 5627d88d6dec269a0b2dcc4538773fe6bbfc767d (diff) | |
| download | Tango-8438e5447b6bed6ed97f2e3fda6977ce4bf74d0c.tar.gz Tango-8438e5447b6bed6ed97f2e3fda6977ce4bf74d0c.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Tango.Scripting.Basic.csproj')
| -rw-r--r-- | Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Tango.Scripting.Basic.csproj | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Tango.Scripting.Basic.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Tango.Scripting.Basic.csproj index 8af52748a..be52ca57a 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Tango.Scripting.Basic.csproj +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Tango.Scripting.Basic.csproj @@ -136,7 +136,6 @@ <Compile Include="CompilationResult.cs" /> <Compile Include="GlobalObject.cs" /> <Compile Include="Project.cs" /> - <Compile Include="ProjectManager.cs" /> <Compile Include="ReferenceAssembly.cs" /> <Compile Include="Properties\AssemblyInfo.cs"> <SubType>Code</SubType> |