lost the patch directives on merge conflict fix

Change-Id: I69321f8a5b4c0377ac6ceb7b6795d25bd9a3e6ba

lost the patch directives on merge conflict fix
Change-Id: I69321f8a5b4c0377ac6ceb7b6795d25bd9a3e6ba
23d3a5e2 · Caolán McNamara · 6843ce88 · 23d3a5e2
Kaydet (Commit) 23d3a5e2 authored Haz 29, 2012 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

mythes-1.2.0-makefile-mk.diff mythes/mythes-1.2.0-makefile-mk.diff +1 -0

No files found.
--- a/mythes/mythes-1.2.0-makefile-mk.diff
+++ b/mythes/mythes-1.2.0-makefile-mk.diff
 --- 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
 +#*************************************************************************
 +#