From 1bdbb73c0e93759a8307d89448734f29f8072bf8 Mon Sep 17 00:00:00 2001
From: Satnam Singh <satnam@google.com>
Date: Wed, 24 Sep 2014 10:16:05 -0700
Subject: [PATCH] And a few more capatalization undos.

---
 manager/manager.go | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/manager/manager.go b/manager/manager.go
index bbfbc37d..a3c0ef42 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -145,7 +145,6 @@ func (self *manager) globalHousekeeping(quit chan error) {
 	}
 
 	ticker := time.Tick(*globalHousekeepingInterval)
-<<<<<<< HEAD
 	for {
 		select {
 		case t := <-ticker:
@@ -156,16 +155,6 @@ func (self *manager) globalHousekeeping(quit chan error) {
 			if err != nil {
 				glog.Errorf("Failed to detect containers: %s", err)
 			}
-=======
-	for t := range ticker {
-		start := time.Now()
-
-		// Check for new containers.
-		err := self.detectSubcontainers("/")
-		if err != nil {
-			glog.Errorf("Failed to detect containers: %s", err)
-		}
->>>>>>> Undo changes to if statements as requested by vmarmol. Fix typos in my changes.
 
 			// Log if housekeeping took too long.
 			duration := time.Since(start)
@@ -423,7 +412,7 @@ func (self *manager) watchForNewContainers(quit chan error) error {
 		root, ok = self.containers["/"]
 	}()
 	if !ok {
-		return fmt.Errorf("root container does not exist when watching for new containers")
+		return fmt.Errorf("Root container does not exist when watching for new containers")
 	}
 
 	// Register for new subcontainers.
@@ -439,15 +428,14 @@ func (self *manager) watchForNewContainers(quit chan error) error {
 	}
 
 	// Listen to events from the container handler.
-<<<<<<< HEAD
 	go func() {
 		for {
 			select {
 			case event := <-events:
 				switch {
-				case event.EventType == container.SUBCONTAINER_ADD:
+				case event.EventType == container.SubcontainerAdd:
 					err = self.createContainer(event.Name)
-				case event.EventType == container.SUBCONTAINER_DELETE:
+				case event.EventType == container.SubcontainerDelete:
 					err = self.destroyContainer(event.Name)
 				}
 				if err != nil {
@@ -462,17 +450,6 @@ func (self *manager) watchForNewContainers(quit chan error) error {
 					return
 				}
 			}
-=======
-	for event := range events {
-		switch {
-		case event.EventType == container.SubcontainerAdd:
-			err = self.createContainer(event.Name)
-		case event.EventType == container.SubcontainerDelete:
-			err = self.destroyContainer(event.Name)
-		}
-		if err != nil {
-			glog.Warning("failed to process watch event: %v", err)
->>>>>>> Undo changes to if statements as requested by vmarmol. Fix typos in my changes.
 		}
 	}()
 	return nil