]> git.pld-linux.org Git - packages/charles.git/commitdiff
projects / packages / charles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5f50a8f)
- ups
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Fri, 30 Oct 2009 09:20:50 +0000 (09:20 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    charles.spec -> 1.6

charles.spec patch | blob | blame | history

diff --git a/charles.spec b/charles.spec
index 4cd0b29f0a0b1fa50c27fce0e1a15f68ecb25b85..6c524fc9546aa53f6de38537f3fa0b872025d45e 100644 (file)
--- a/charles.spec
+++ b/charles.spec
@@ -1,4 +1,3 @@
-<<<<<<< charles.spec
 
 %include       /usr/lib/rpm/macros.java
 
Web debugging proxy application
This page took 0.203722 seconds and 4 git commands to generate.