Revision 2b0ec5b8 trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
| b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 92 | 92 |
// |
| 93 | 93 |
// You can specify all the values or you can default the Build and Revision Numbers |
| 94 | 94 |
// by using the '*' as shown below: |
| 95 |
<<<<<<< HEAD |
|
| 96 |
// [assembly: AssemblyVersion("1.0.*")]
|
|
| 97 |
[assembly: AssemblyVersion("0.7.20427.0")]
|
|
| 98 |
[assembly: AssemblyFileVersionAttribute("0.7.20427.0")]
|
|
| 99 |
======= |
|
| 100 |
// [assembly: AssemblyVersion("1.0.*")]
|
|
| 101 | 95 |
[assembly: AssemblyVersion("0.7.20430.0")]
|
| 102 | 96 |
[assembly: AssemblyFileVersionAttribute("0.7.20430.0")]
|
| 103 |
>>>>>>> 1865ad904d16c957b461d4f539cd762dfaf29dae |
|
Also available in: Unified diff