Resolved merge conflcts

inasafe · Jun 5, 2013 · 343f5db · 343f5db
2 parents bf693fa + b84b47b
commit 343f5db
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/docs/i18n/id/LC_MESSAGES/user-docs/impact_function_docs/FloodBuildingImpactFunction.po b/docs/i18n/id/LC_MESSAGES/user-docs/impact_function_docs/FloodBuildingImpactFunction.po
@@ -167,13 +167,6 @@ msgstr ""
 #~ msgid "**Citations**:"
 #~ msgstr "**Kutipan**:"
 
-# c80b897785de497480154a94feb65764
-#~ msgid ""
-#~ "Hutchings, Field & Parks. Assessment of Flood impacts on buildings. "
-#~ "Impact. Vol 66(2). 2012"
-#~ msgstr ""
-#~ "Hutchings, Field & Parks. Assessment of Flood impacts on buildings. "
-#~ "Impact. Vol 66(2). 2012"
 
 # cc4498ac0fa64c339cd9ae79d14918a1
 #~ msgid ""