ec0db0ed21
# Conflicts: # SicUI/Properties/AssemblyInfo.cs |
||
---|---|---|
.. | ||
Config | ||
Instances | ||
Properties | ||
Resources | ||
Views | ||
App.config | ||
App.xaml | ||
App.xaml.cs | ||
SicSimulator.csproj |
ec0db0ed21
# Conflicts: # SicUI/Properties/AssemblyInfo.cs |
||
---|---|---|
.. | ||
Config | ||
Instances | ||
Properties | ||
Resources | ||
Views | ||
App.config | ||
App.xaml | ||
App.xaml.cs | ||
SicSimulator.csproj |