Index: OKI_SOA/Source/Common/Intergraph.Oki.Soa.Common.DataStructures/Intergraph.Oki.Soa.Common.DataStructures.csproj
===================================================================
--- OKI_SOA/Source/Common/Intergraph.Oki.Soa.Common.DataStructures/Intergraph.Oki.Soa.Common.DataStructures.csproj (revision 0)
+++ OKI_SOA/Source/Common/Intergraph.Oki.Soa.Common.DataStructures/Intergraph.Oki.Soa.Common.DataStructures.csproj (working copy)
@@ -0,0 +1,56 @@
+?
+
+
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {312E463F-4FFF-4E5B-A6F5-5EB36114B197}
+ Library
+ Properties
+ Intergraph.Oki.Soa.Common.DataStructures
+ Intergraph.Oki.Soa.Common.DataStructures
+ v4.0
+ 512
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+ Properties\AssemblyVersionInfo.cs
+
+
+
+
+
+
\ No newline at end of file
Index: OKI_SOA/Source/Common/Intergraph.Oki.Soa.Common.Interfaces/Intergraph.Oki.Soa.Common.Interfaces.csproj
===================================================================
--- OKI_SOA/Source/Common/Intergraph.Oki.Soa.Common.Interfaces/Intergraph.Oki.Soa.Common.Interfaces.csproj (revision 0)
+++ OKI_SOA/Source/Common/Intergraph.Oki.Soa.Common.Interfaces/Intergraph.Oki.Soa.Common.Interfaces.csproj (working copy)
@@ -0,0 +1,57 @@
+?
+
+
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {E63DC849-42DA-4874-A6BC-660DD37AED9C}
+ Library
+ Properties
+ Intergraph.Oki.Soa.Common.Interfaces
+ Intergraph.Oki.Soa.Common.Interfaces
+ v4.0
+ 512
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Properties\AssemblyVersionInfo.cs
+
+
+
+
+
\ No newline at end of file
Index: TOOLS/OKIVersionNumber/version.txt
===================================================================
--- TOOLS/OKIVersionNumber/version.txt (revision 53)
+++ TOOLS/OKIVersionNumber/version.txt (working copy)
@@ -1 +1,3 @@
-3.0.01.030
\ No newline at end of file
+<<<<<<< .mine
+3.0.01.026=======
+3.0.01.030>>>>>>> .r53