From 42283461d3f236881f67d8aa9bb8bc96decdacae Mon Sep 17 00:00:00 2001
From: Damien Le Moal <damien.lemoal@wdc.com>
Date: Fri, 18 Jan 2019 16:09:14 +0900
Subject: payload: rename dummy payload to test payload

Use a more neutral term more representative of this payload intent.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
---
 docs/firmware/fw_payload.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs')

diff --git a/docs/firmware/fw_payload.md b/docs/firmware/fw_payload.md
index 3a8a14d..aff254d 100644
--- a/docs/firmware/fw_payload.md
+++ b/docs/firmware/fw_payload.md
@@ -35,6 +35,7 @@ firmware:
 
 * **FW_PAYLOAD_OFFSET** - Offset from *FW_TEXT_BASE* where the payload
 binary will be linked in the final *FW_PAYLOAD* firmware binary image.
+<<<<<<< HEAD
 This configuration parameter is mandatory if *FW_PAYLOAD_ALIGN* is not
 defined.  Compilation errors will result from an incorrect definition
 of *FW_PAYLOAD_OFFSET* or *FW_PAYLOAD_ALIGN*, or if neither of these
-- 
cgit v1.2.3