From a51ff744b6c39bd849124345907d4785da103d14 Mon Sep 17 00:00:00 2001
From: Abdullah Sowayan <sowayan@users.noreply.github.com>
Date: Tue, 11 Sep 2007 17:26:00 +0000
Subject: Tue Sep 11 17:25:01 UTC 2007  Abdullah Sowayan 
 <abdullah.sowayan@lmco.com>

---
 ACE/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a9767fc4554..806b04f9e97 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -172,7 +172,6 @@ Mon Sep 03 02:50:30 CDT 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ACE version 5.6 released.
 
->>>>>>> .r79627
 Thu Aug 30 17:23:21 UTC 2007  Steve Huston  <shuston@riverace.com>
 
         * bin/LabVIEW_RT/labview_test_controller/stdafx.cpp:
-- 
cgit v1.2.1