diff options
| author | Richard Hughes <richard@hughsie.com> | 2009-03-04 13:12:10 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2009-03-04 13:12:10 +0000 |
| commit | 57c13c74946a1f147a0892fe4d64c34339bb2cca (patch) | |
| tree | aa1a05e05fa50f14e494f7309acf4df1df4a60f2 /.gitignore | |
| parent | 9ae0b5c57348473122806e68225b4669d7a54b55 (diff) | |
| parent | 546ca4456db68c1c35adbb8c915e1ede47653760 (diff) | |
trivial: fix conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -41,7 +41,7 @@ intltool-merge.in intltool-merge intltool-update.in intltool-update -devicekit-power.pc +*.pc xmldocs.make omf.make gtk-doc.make |