summaryrefslogtreecommitdiff
path: root/tmwserv.dev
diff options
context:
space:
mode:
Diffstat (limited to 'tmwserv.dev')
-rw-r--r--tmwserv.dev5
1 files changed, 0 insertions, 5 deletions
diff --git a/tmwserv.dev b/tmwserv.dev
index d106dad9..6288889a 100644
--- a/tmwserv.dev
+++ b/tmwserv.dev
@@ -1,12 +1,7 @@
[Project]
FileName=tmwserv.dev
-<<<<<<< tmwserv.dev
-Name=tmwserv
-UnitCount=17
-=======
Name=tmwserv
UnitCount=74
->>>>>>> 1.2
Type=1
Ver=1
ObjFiles=