From 7562da8ce7aaa2a841e81ab54c76b3dbe72857cc Mon Sep 17 00:00:00 2001
From: Ruediger Oertel <ro@suse.de>
Date: Wed, 17 Nov 2010 14:55:50 +0000
Subject: [PATCH] - fix typo (merge conflict overlooked)

OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=168
---
 aaa_base.changes | 5 +++++
 aaa_base.tar.bz2 | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/aaa_base.changes b/aaa_base.changes
index 16d4fdc..12764e6 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov 17 15:55:09 CET 2010 - ro@suse.de
+
+- fix typo (merge conflict overlooked) 
+
 -------------------------------------------------------------------
 Wed Nov 17 12:53:36 CET 2010 - ro@suse.de
 
diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2
index de79830..5842554 100644
--- a/aaa_base.tar.bz2
+++ b/aaa_base.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0dac6d3f3250d92d79343dbad634ab59da4176d07c512db9bb6ac7a4e3ff79ad
-size 81490
+oid sha256:208c58153b03b693632eabf10ceb5b238d37b9e7a1db5523ace198b22c003f1c
+size 81479