fix#1216:Merge conflicts resolved

openMF · Feb 26, 2021 · d9ba446 · d9ba446
1 parent 25ce010
commit d9ba446
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/SIDetailsActivity.kt b/...src/main/java/org/mifos/mobilewallet/mifospay/standinginstruction/ui/SIDetailsActivity.kt
@@ -41,7 +41,8 @@ class SIDetailsActivity : BaseActivity(), StandingInstructionContract.SIDetailsV
     lateinit var mPresenter: StandingInstructionDetailsPresenter
     private lateinit var mStandingInstructionPresenter:
             StandingInstructionContract.StandingInstructorDetailsPresenter
-
+    private lateinit var mOptionsMenu: Menu
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_si_details)