[Debian-NP-Commits] r87 - trunk

[micah]

Author: micah-guest
Date: Thu Jun 17 18:51:30 2004
New Revision: 87

Added:
   trunk/svn-commit.2.tmp
   trunk/svn-commit.3.tmp
   trunk/svn-commit.tmp
Log:
asdasd



Added: trunk/svn-commit.2.tmp
==============================================================================
--- (empty file)
+++ trunk/svn-commit.2.tmp	Thu Jun 17 18:51:30 2004
@@ -0,0 +1,11 @@
+
+Resolved conflict and check in backup of directory
+
+--This line, and those below, will be ignored--
+
+M    docs/development_overview.txt
+A    docs/server2
+A    docs/server2/index.html
+A    docs/server2/design.html
+A    docs/server2/personas.html
+A    docs/server2/server_spec.txt

Added: trunk/svn-commit.3.tmp
==============================================================================
--- (empty file)
+++ trunk/svn-commit.3.tmp	Thu Jun 17 18:51:30 2004
@@ -0,0 +1,11 @@
+
+Strange...
+
+--This line, and those below, will be ignored--
+
+M    docs/development_overview.txt
+A    docs/server2
+A    docs/server2/index.html
+A    docs/server2/design.html
+A    docs/server2/personas.html
+A    docs/server2/server_spec.txt

Added: trunk/svn-commit.tmp
==============================================================================
--- (empty file)
+++ trunk/svn-commit.tmp	Thu Jun 17 18:51:30 2004
@@ -0,0 +1,6 @@
+Make cp so I can revert
+
+--This line, and those below, will be ignored--
+
+M    docs/development_overview.txt
+A    docs/server2