Skip to content
This repository
Browse code

ack, remove a silly merge issue from the spec.

  • Loading branch information...
commit b994d3dac97b2709d03c46fee93b56fde39e9482 1 parent ae59555
David Castro authored May 18, 2012

Showing 1 changed file with 0 additions and 5 deletions. Show diff stats Hide diff stats

  1. 5  kibana.spec
5  kibana.spec
@@ -47,14 +47,9 @@ rm -rf %{buildroot}
47 47
 %config(noreplace) %attr(0644,root,root) /etc/httpd/conf.d/kibana.conf
48 48
 
49 49
 %changelog
50  
-<<<<<<< HEAD
51  
-* Fri Apr 06 2012 David Castro arimus@gmail.com 0.1.5-1
52  
-=======
53 50
 * Fri May 18 2012 David Castro arimus@gmail.com 0.1.5-1
54 51
 - Modified spec to work with rpmbuild -ta kibana-0.1.5.tar.gz style builds,
55 52
   which only requires that the github-style tarballs are renamed to
56 53
   kibana-X.Y.Z.tar.gz
57 54
 
58 55
 * Fri Apr 06 2012 David Castro arimus@gmail.com 0.1.4
59  
->>>>>>> e39917caacafc6c5e6188ab679022dd2f3377a4c
60  
-- Initial spec

0 notes on commit b994d3d

Please sign in to comment.
Something went wrong with that request. Please try again.