applications: clime: Fix unifinished merge

Signed-off-by: Marek Maškarinec <[email protected]>

Author: marekmaskarinec

applications/clime/codec/cs-decoder.js

@@ -273,14 +273,8 @@ function s32() {
 }
 
 if (false) {
-<<<<<<< HEAD
   var hex = "af01070eda0d23022e094f096d0d2887c4e46400145c0000";
   var buf = Buffer.from(hex, "hex");
   console.log(decodeUplink({ bytes: buf }));
-=======
-  var hex = "9703ffffffffff0221094c093f000100000000";
-  var buf = Buffer.from(hex, "hex");
-  console.log(JSON.stringify(decodeUplink({ bytes: buf })));
->>>>>>> 46a8f6ff (applications: clime: Add soil sensor lrw encoding)
 }
 

applications/clime/project.yaml

@@ -44,46 +44,6 @@ variants:
   fw_version: v3.0.1
   features:
     - hardware-chester-sps30
-=======
-  - name: CHESTER Clime
-    fw_bundle: com.hardwario.chester.app.clime
-    fw_name: hio-chester-clime
-    fw_version: v3.0.0
-    features:
-      - hardware-chester-s2
-  - name: CHESTER Clime Z
-    fw_bundle: com.hardwario.chester.app.clime.z
-    fw_name: hio-chester-clime-z
-    fw_version: v3.0.0
-    features:
-      - hardware-chester-z
-      - hardware-chester-s2
-    remark: Support for CHESTER-Z
-  - name: CHESTER Clime IAQ
-    fw_bundle: com.hardwario.chester.app.clime.iaq
-    fw_name: hio-chester-clime-iaq
-    fw_version: v3.0.0
-    features:
-      - hardware-chester-s1
-      - hardware-chester-x10
-  - name: CHESTER Clime RTD
-    fw_bundle: com.hardwario.chester.app.clime.rtd
-    fw_name: hio-chester-clime-rtd
-    fw_version: v3.0.0
-    features:
-      - hardware-chester-rtd-a
-  - name: CHESTER Clime 1W
-    fw_bundle: com.hardwario.chester.app.clime.1w
-    fw_name: hio-chester-clime-1w
-    fw_version: v3.0.0
-    remark:
-  - name: CHESTER Clime TC
-    fw_bundle: com.hardwario.chester.app.clime.tc
-    fw_name: hio-chester-clime-tc
-    fw_version: v3.0.0
-    features:
-      - hardware-chester-tc-a
->>>>>>> 6ab59302 (Add soil sensor lrw encoding support)
 project:
   variant: Clime
   company: 2024 HARDWARIO a.s.
@@ -131,7 +91,6 @@ features:
 #- hardware-chester-tc-a
 #- hardware-chester-tc-b
 parameters:
-<<<<<<< HEAD
 - name: interval-sample
   type: int
   min: 1