diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-29 12:43:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-29 12:43:37 +0100 |
| commit | 23d3a5e257e21520419133f02f449d007ad49644 (patch) | |
| tree | b6324e7dbeb648cea0cd1c78989722aebcefb2d3 /mythes | |
| parent | 6843ce885e3e128d24ea8472da4883de223213cd (diff) | |
lost the patch directives on merge conflict fix
Change-Id: I69321f8a5b4c0377ac6ceb7b6795d25bd9a3e6ba
Diffstat (limited to 'mythes')
| -rw-r--r-- | mythes/mythes-1.2.0-makefile-mk.diff | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mythes/mythes-1.2.0-makefile-mk.diff b/mythes/mythes-1.2.0-makefile-mk.diff index 4b7b5523a152..de247f662dc6 100644 --- a/mythes/mythes-1.2.0-makefile-mk.diff +++ b/mythes/mythes-1.2.0-makefile-mk.diff @@ -1,5 +1,6 @@ --- misc/mythes-1.2.3/makefile.mk 2010-05-14 23:36:09.000000000 +0200 +++ misc/build/mythes-1.2.3/makefile.mk 2010-05-14 23:35:14.000000000 +0200 +@@ -1 +1,84 @@ -dummy +#************************************************************************* +# |