Skip to content

Fix npm test by resolving merge conflict and JSON syntax error #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dreadwitdastacc-IFA merged 4 commits into from
Jan 3, 2026
Merged

Fix npm test by resolving merge conflict and JSON syntax error #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c68fcd
Initial plan
Copilot Jan 3, 2026
9b0df45
Fix jsconfig.json syntax error by removing EOF marker
Copilot Jan 3, 2026
f1af102
Resolve merge conflict in App.jsx to fix test failures
Copilot Jan 3, 2026
952c898
Merge branch 'Dreadwitdastacc-Ifawole' into copilot/run-npm-tests
dreadwitdastacc-IFA Jan 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion jsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@
},
"include": ["src"]
}
EOF
22 changes: 4 additions & 18 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<<<<<<< HEAD
/**
* @file App.jsx
* @description Main application component. Renders the dashboard header and all main widgets.
*/
import React, { useState, useEffect } from "react";
import PropTypes from "prop-types";
import "./App.css";
Expand All @@ -7,23 +10,6 @@ import ExpenseBreakdown from "./ExpenseBreakdown";
import ReportGenerator from "./ReportGenerator";

import ExpenseBreakdownChart from "./ExpenseBreakdownChart";
=======
/**
* @file App.jsx
* @description Main application component. Renders the dashboard header and all main widgets.
*/



/**
* @file App.jsx
* @description Main application component. Renders the dashboard header and all main widgets.
*/import React from 'react';
import './App.css';
import ProfitLossSummary from './ProfitLossSummary';
import ExpenseBreakdown from './ExpenseBreakdown';
import ReportGenerator from './ReportGenerator';
>>>>>>> chore/split-chunks-readme

import LitecoinPriceBot from "./LitecoinPriceBot";

Expand Down
Loading