[LON-CAPA-cvs] cvs: loncom(Refactoring) / lond

[foxr]

foxr		Tue Mar  2 06:33:03 2004 EDT

  Modified files:              (Branch: Refactoring)
    /loncom	lond 
  Log:
  Resolve conflicts .
  
  
Index: loncom/lond
diff -u loncom/lond:1.178.2.5 loncom/lond:1.178.2.6
--- loncom/lond:1.178.2.5	Tue Feb 24 11:52:16 2004
+++ loncom/lond	Tue Mar  2 06:33:03 2004
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.178.2.5 2004/02/24 16:52:16 albertel Exp $
+# $Id: lond,v 1.178.2.6 2004/03/02 11:33:03 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,7 +53,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.178.2.5 $'; #' stupid emacs
+my $VERSION='$Revision: 1.178.2.6 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -1672,7 +1672,8 @@
 #     0   - Exit server.
 #
 #
-sub DeletProfileEntry {
+
+sub DeleteProfileEntry {
     my $cmd      = shift;
     my $tail     = shift;
     my $client   = shift;
@@ -2028,7 +2029,7 @@
 
 
 }
-RegisterHandler("restor", \&RestoreHandler, 0,1,0);
+RegisterHandler("restore", \&RestoreHandler, 0,1,0);
 
 #
 #   Add a chat message to to a discussion board.